[Librefm-commits] [1429] Sync with trunk.

librefm-commits
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Librefm-commits] [1429] Sync with trunk.

From:	Toby Inkster
Subject:	[Librefm-commits] [1429] Sync with trunk.
Date:	Sat, 09 May 2009 09:53:02 +0000
Revision: 1429
          http://svn.sv.gnu.org/viewvc/?view=rev&root=librefm&revision=1429
Author:   tobyink
Date:     2009-05-09 09:53:02 +0000 (Sat, 09 May 2009)
Log Message:
-----------
Sync with trunk.

Modified Paths:
--------------
    branches/stable/nixtape/utils/arc/extractors/ARC2_PoshRdfExtractor.php
    branches/stable/nixtape/utils/arc/extractors/ARC2_RDFExtractor.php
    branches/stable/nixtape/utils/arc/extractors/ARC2_RdfaExtractor.php
    branches/stable/nixtape/utils/arc/parsers/ARC2_AtomParser.php
    branches/stable/nixtape/utils/arc/parsers/ARC2_CBJSONParser.php
    branches/stable/nixtape/utils/arc/parsers/ARC2_LegacyXMLParser.php
    branches/stable/nixtape/utils/arc/store/ARC2_StoreEndpoint.php
    branches/stable/nixtape/utils/arc/store/ARC2_StoreSelectQueryHandler.php

Modified: branches/stable/nixtape/utils/arc/extractors/ARC2_PoshRdfExtractor.php
===================================================================
--- branches/stable/nixtape/utils/arc/extractors/ARC2_PoshRdfExtractor.php      
2009-05-09 09:48:22 UTC (rev 1428)
+++ branches/stable/nixtape/utils/arc/extractors/ARC2_PoshRdfExtractor.php      
2009-05-09 09:53:02 UTC (rev 1429)
@@ -103,7 +103,7 @@
     /* new s */
     if ($this->hasClass($n, 'rdf-s')) {
       $lct['next_s'] = array($n['a']['class'], $this->getSubject($n, $lct));
-      //echo "\ns: " . //($lct['next_s'], 1);
+      //echo "\ns: " . print_r($lct['next_s'], 1);
     }
     /* p */
     if ($this->hasClass($n, 'rdf-p') || $this->hasRel($n, 'rdf-p')) {

Modified: branches/stable/nixtape/utils/arc/extractors/ARC2_RDFExtractor.php
===================================================================
--- branches/stable/nixtape/utils/arc/extractors/ARC2_RDFExtractor.php  
2009-05-09 09:48:22 UTC (rev 1428)
+++ branches/stable/nixtape/utils/arc/extractors/ARC2_RDFExtractor.php  
2009-05-09 09:53:02 UTC (rev 1429)
@@ -183,7 +183,7 @@
   }
   
   function getContent($n, $outer = 0, $trim = 1) {
-    //echo '<pre>' . htmlspecialchars(//($n, 1)) . '</pre>';
+    //echo '<pre>' . htmlspecialchars(print_r($n, 1)) . '</pre>';
     if ($n['tag'] == 'comment') {
       $r = '<!-- ' . $n['a']['value'] . ' -->';
     }

Modified: branches/stable/nixtape/utils/arc/extractors/ARC2_RdfaExtractor.php
===================================================================
--- branches/stable/nixtape/utils/arc/extractors/ARC2_RdfaExtractor.php 
2009-05-09 09:48:22 UTC (rev 1428)
+++ branches/stable/nixtape/utils/arc/extractors/ARC2_RdfaExtractor.php 
2009-05-09 09:53:02 UTC (rev 1429)
@@ -27,7 +27,7 @@
   /*  */
   
   function extractRDF() {
-    //echo '<pre>' . htmlspecialchars(//($this->nodes, 1)) . '</pre>';
+    //echo '<pre>' . htmlspecialchars(print_r($this->nodes, 1)) . '</pre>';
     if (!isset($this->caller->detected_formats['rdfa'])) return 0;
     $root_node = $this->getRootNode();
     //$base = $this->v('xml:base', $this->getDocBase(), $root_node['a']);
@@ -321,6 +321,7 @@
   /*  */
   
   function xURI($v, $base, $ns, $attr_type = '') {
+  
     if ((list($sub_r, $sub_v) = $this->xBlankCURIE($v, $base, $ns)) && $sub_r) 
{
       return array($sub_r, $sub_v);
     }
@@ -330,8 +331,8 @@
     if ((list($sub_r, $sub_v) = $this->xCURIE($v, $base, $ns)) && $sub_r) {
       return array($sub_r, $sub_v);
     }
-    if (preg_match('/^(rel|rev)$/', $attr_type) && 
preg_match('/^\s*(alternate|appendix|bookmark|cite|chapter|contents|copyright|glossary|help|icon|index|last|license|meta|next|p3pv1|prev|role|section|stylesheet|subsection|start|up)(\s|$)/s',
 $v, $m)) {
-      return array('http://www.w3.org/1999/xhtml/vocab#' . $m[1], 
preg_replace('/^\s*' . $m[1]. '/s', '', $v));
+    if (preg_match('/^(rel|rev)$/', $attr_type) && 
preg_match('/^\s*(alternate|appendix|bookmark|cite|chapter|contents|copyright|glossary|help|icon|index|last|license|meta|next|p3pv1|prev|role|section|stylesheet|subsection|start|up)(\s|$)/is',
 $v, $m)) {
+      return array('http://www.w3.org/1999/xhtml/vocab#' . substr($m[1], 
preg_replace('/^\s*' . strtolower($m[1]). '/s', '', $v)));
     }
     if (preg_match('/^(rel|rev)$/', $attr_type) && 
preg_match('/^[a-z0-9\.]+$/i', $v)) {
       return array(0, $v);
@@ -361,7 +362,7 @@
   }
   
   function xCURIE($v, $base, $ns) {
-    if ($sub_r = $this->x('([a-z0-9\-\_]*)\:([a-z0-9\-\_]+)', $v)) {
+    if ($sub_r = $this->x('([a-z0-9\-\_]*)\:(.+)', $v)) {
       if (!$sub_r[1]) return array('http://www.w3.org/1999/xhtml/vocab#' . 
$sub_r[2], '');
       if (isset($ns[$sub_r[1]])) {
         return array($ns[$sub_r[1]] . $sub_r[2], '');

Modified: branches/stable/nixtape/utils/arc/parsers/ARC2_AtomParser.php
===================================================================
--- branches/stable/nixtape/utils/arc/parsers/ARC2_AtomParser.php       
2009-05-09 09:48:22 UTC (rev 1428)
+++ branches/stable/nixtape/utils/arc/parsers/ARC2_AtomParser.php       
2009-05-09 09:53:02 UTC (rev 1429)
@@ -53,7 +53,7 @@
   function addT($t) {
     //if (!isset($t['o_datatype']))
     if ($this->skip_dupes) {
-      //$h = md5(//($t, 1));
+      //$h = md5(print_r($t, 1));
       $h = md5(serialize($t));
       if (!isset($this->added_triples[$h])) {
         $this->triples[$this->t_count] = $t;
@@ -83,7 +83,7 @@
 
   function extractRDF() {
     $index = $this->getNodeIndex();
-    ////($index);
+    //print_r($index);
     $this->rdf = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#';
     $this->atom = 'http://www.w3.org/2005/atom';
     $this->rss = 'http://purl.org/rss/1.0/';

Modified: branches/stable/nixtape/utils/arc/parsers/ARC2_CBJSONParser.php
===================================================================
--- branches/stable/nixtape/utils/arc/parsers/ARC2_CBJSONParser.php     
2009-05-09 09:48:22 UTC (rev 1428)
+++ branches/stable/nixtape/utils/arc/parsers/ARC2_CBJSONParser.php     
2009-05-09 09:53:02 UTC (rev 1429)
@@ -43,7 +43,7 @@
       /* explicit triples */
       $this->extractResourceRDF($struct, $s);
     }
-    ////($struct);
+    //print_r($struct);
   }
   
   function getStructType($struct, $rel = '') {

Modified: branches/stable/nixtape/utils/arc/parsers/ARC2_LegacyXMLParser.php
===================================================================
--- branches/stable/nixtape/utils/arc/parsers/ARC2_LegacyXMLParser.php  
2009-05-09 09:48:22 UTC (rev 1428)
+++ branches/stable/nixtape/utils/arc/parsers/ARC2_LegacyXMLParser.php  
2009-05-09 09:53:02 UTC (rev 1429)
@@ -142,7 +142,7 @@
   }
   
   function getNodeContent($n, $outer = 0, $trim = 1) {
-    //echo '<pre>' . htmlspecialchars(//($n, 1)) . '</pre>';
+    //echo '<pre>' . htmlspecialchars(print_r($n, 1)) . '</pre>';
     if ($n['tag'] == 'cdata') {
       $r = $n['a']['value'];
     }
@@ -214,7 +214,7 @@
   /*  */
   
   function open($p, $t, $a) {
-    //echo "<br />\n".'opening '.$t . ' ' . //($a, 1); flush();
+    //echo "<br />\n".'opening '.$t . ' ' . print_r($a, 1); flush();
     //echo "<br />\n".'opening '.$t; flush();
     $t = strtolower($t);
     /* base check */

Modified: branches/stable/nixtape/utils/arc/store/ARC2_StoreEndpoint.php
===================================================================
--- branches/stable/nixtape/utils/arc/store/ARC2_StoreEndpoint.php      
2009-05-09 09:48:22 UTC (rev 1428)
+++ branches/stable/nixtape/utils/arc/store/ARC2_StoreEndpoint.php      
2009-05-09 09:53:02 UTC (rev 1429)
@@ -223,7 +223,7 @@
     }
     else {
       $this->setHeader('content-type', 'Content-type: text/plain; 
charset=utf-8');
-      $this->result = 'Result serializer not available, dumping raw data:' . 
"\n" . //($r, 1);
+      $this->result = 'Result serializer not available, dumping raw data:' . 
"\n" . print_r($r, 1);
     }
   }
   
@@ -439,7 +439,7 @@
 
   function getPlainSelectResultDoc($r) {
     $this->setHeader('content-type', 'Content-Type: text/plain');
-    return //($r['result'], 1);
+    return print_r($r['result'], 1);
   }
 
   function getHTMLTableSelectResultDoc($r) {

Modified: 
branches/stable/nixtape/utils/arc/store/ARC2_StoreSelectQueryHandler.php
===================================================================
--- branches/stable/nixtape/utils/arc/store/ARC2_StoreSelectQueryHandler.php    
2009-05-09 09:48:22 UTC (rev 1428)
+++ branches/stable/nixtape/utils/arc/store/ARC2_StoreSelectQueryHandler.php    
2009-05-09 09:53:02 UTC (rev 1429)
@@ -649,7 +649,7 @@
       return 1;
     }
     $d_tbls = $this->getDependentJoins($id2);
-    //echo $id . ' :: ' . $id2 . '=>' . //($d_tbls, 1);
+    //echo $id . ' :: ' . $id2 . '=>' . print_r($d_tbls, 1);
     foreach ($d_tbls as $d_tbl) {
       if (preg_match('/^T_' .$id. '\./', $d_tbl)) {
         return 1;
@@ -768,7 +768,7 @@
       $d_joins = $this->getDependentJoins($id);
       $added = array();
       $d_aliases = array();
-      //echo $id . ' =>' . //($d_joins, 1);
+      //echo $id . ' =>' . print_r($d_joins, 1);
       $id_alias = 'T_' . $id . '.s';
       foreach ($d_joins as $alias) {
         if (preg_match('/^(T|V|G)_([0-9\_]+)(_[spo])?\.([a-z\_]+)/', $alias, 
$m)) {
[Prev in Thread]
Current Thread
[Next in Thread]
[Librefm-commits] [1429] Sync with trunk., Toby Inkster <=
Prev by Date: [Librefm-commits] [1428] Restore use of print_r() which is in no danger of dumping passwords to screen.
Next by Date: [Librefm-commits] [1430] Add language selection widget
Previous by thread: [Librefm-commits] [1428] Restore use of print_r() which is in no danger of dumping passwords to screen.
Next by thread: [Librefm-commits] [1430] Add language selection widget
Index(es):
- Date
- Thread