Apply 91c5270 properly/fix conflict

CloCkWeRX · Mar 22, 2012 · c774634 · c774634
2 parents 8b74481 + 2727506
commit c774634
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/store/ARC2_StoreConstructQueryHandler.php b/store/ARC2_StoreConstructQueryHandler.php
@@ -75,11 +75,11 @@ function getResultIndex($qr) {
           }
           $t[$term] = $val;
           $t[$term . '_type'] = $type;
-          if (isset($row[$term . ' lang'])) {
-            $t[$term . '_lang'] = $row[$term . ' lang'];
+          if (isset($row[$ct[$term] . ' lang'])) {
+            $t[$term . '_lang'] = $row[$ct[$term] . ' lang'];
           }
-          if (isset($row[$term . ' datatype'])) {
-            $t[$term . '_datatype'] = $row[$term . ' datatype'];
+          if (isset($row[$ct[$term] . ' datatype'])) {
+            $t[$term . '_datatype'] = $row[$ct[$term] . ' datatype'];
           }
         }
         if (!$skip_t) {

diff --git a/store/ARC2_StoreEndpoint.php b/store/ARC2_StoreEndpoint.php
@@ -995,7 +995,7 @@ function getHTMLDocBody() {
           <p>
             <a href="?">This interface</a> implements
             <a href="http://www.w3.org/TR/rdf-sparql-query/">SPARQL</a> and
-            <a href="http://arc.semsol.org/docs/v2/sparql+">SPARQL+</a> via <a href="http://www.w3.org/TR/rdf-sparql-protocol/#query-bindings-http">HTTP Bindings</a>.
+            <a href="https://github.com/semsol/arc2/wiki/SPARQL%2B">SPARQL+</a> via <a href="http://www.w3.org/TR/rdf-sparql-protocol/#query-bindings-http">HTTP Bindings</a>. 
           </p>
           <p>
             Enabled operations: ' . join(', ', $this->getFeatures()) . '