Support OR and AND search, make AND default

The search filter now supports OR and AND searches. Entering multiple words results in AND concatenation, searching for exact match requires surrounding with '' (e.g. 'Journal of')
AKSW · Jan 27, 2014 · bf7455d · bf7455d
1 parent 5a91642
commit bf7455d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/library/Erfurt/Store.php b/library/Erfurt/Store.php
@@ -795,6 +795,15 @@ public function getSearchPattern($stringSpec, $graphUris, $options = array())
 
         // TODO stringSpec should be more than simple string (parse for and/or/xor etc...)
         $stringSpec = (string) $stringSpec;
+        if (strpbrk($stringSpec, '\'') === false) {
+            $parts = explode(' ', $stringSpec);
+            $stringSpec = '';
+            foreach ($parts as $word) {
+                $stringSpec.= '\'' . $word . '\' AND ';
+            }
+            // Remove the last AND (including whitespace)
+            $stringSpec = substr($stringSpec, 0, strlen($stringSpec)-5);
+        }
 
         $options = array_merge(
             array(

diff --git a/library/Erfurt/Store/Adapter/Virtuoso.php b/library/Erfurt/Store/Adapter/Virtuoso.php
@@ -514,7 +514,7 @@ public function getSearchPattern($stringSpec, $graphUris, $options)
                      */
                         new Erfurt_Sparql_Query2_Function(
                             $bifContains,
-                            array($objectVariable, new Erfurt_Sparql_Query2_RDFLiteral($stringSpec, null, '"\''))
+                            array($objectVariable, new Erfurt_Sparql_Query2_RDFLiteral($stringSpec))
                         )
                     )
                 )