[evolvis-commits] r17636: Backup commit. Switching Development Environment.

messer at evolvis.org messer at evolvis.org
Tue Oct 25 16:46:36 CEST 2011


Author: messer
Date: 2011-10-25 16:46:36 +0200 (Tue, 25 Oct 2011)
New Revision: 17636

Modified:
   branches/evolvis-me/common/advanced_search/ASInputAnalyzer.class.php
   branches/evolvis-me/common/advanced_search/ASTokenizer.class.php
   branches/evolvis-me/common/advanced_search/FusionForgeDFIProvider.class.php
Log:
Backup commit. Switching Development Environment.

Modified: branches/evolvis-me/common/advanced_search/ASInputAnalyzer.class.php
===================================================================
--- branches/evolvis-me/common/advanced_search/ASInputAnalyzer.class.php	2011-10-24 14:13:09 UTC (rev 17635)
+++ branches/evolvis-me/common/advanced_search/ASInputAnalyzer.class.php	2011-10-25 14:46:36 UTC (rev 17636)
@@ -25,10 +25,10 @@
         //If there is no token yet reutrn
         //all possible DFIs.
         if ($tokenCount == 0) {
-            $tmp = $this->DFIProvider->scanAll($params);
+            $tmp = $this->DFIProvider->getDFIList($params);
             
             foreach($tmp as $curDFI) {
-                $result[] = _($curDFI['DFIName']);
+                $result[] = _($curDFI[0]);
             }
         }
         else {

Modified: branches/evolvis-me/common/advanced_search/ASTokenizer.class.php
===================================================================
--- branches/evolvis-me/common/advanced_search/ASTokenizer.class.php	2011-10-24 14:13:09 UTC (rev 17635)
+++ branches/evolvis-me/common/advanced_search/ASTokenizer.class.php	2011-10-25 14:46:36 UTC (rev 17636)
@@ -28,6 +28,15 @@
                     
                     $tokens[] = new ASToken(EASToken::AS_OP_EQUALS, null);
                 }break;
+                case 'NOT': {
+                    //Check if $curTerm is not empty. If it is not, add an DFI Token.
+                    if($curTerm != '') {
+                        $tokens[] = new ASToken(EASToken::AS_DFI, $curTerm);
+                        $curTerm = '';
+                    }
+                    
+                    $tokens[] = new ASToken(EASToken::AS_OP_NOT, null);
+                }break;
                 case 'LIKE': {
                     //Check if $curTerm is not empty. If it is not, add an DFI Token.
                     if($curTerm != '') {

Modified: branches/evolvis-me/common/advanced_search/FusionForgeDFIProvider.class.php
===================================================================
--- branches/evolvis-me/common/advanced_search/FusionForgeDFIProvider.class.php	2011-10-24 14:13:09 UTC (rev 17635)
+++ branches/evolvis-me/common/advanced_search/FusionForgeDFIProvider.class.php	2011-10-25 14:46:36 UTC (rev 17636)
@@ -5,7 +5,8 @@
  */
 
 require_once "IDFIProvider.interface.php";
-
+require_once('www/env.inc.php');
+require_once $gfwww.'include/pre.php'; 
 class FusionForgeDFIProvider implements IDFIProvider {
     /**
      * Nothing todo for fusionforge. FusionForgeDFIs can be identified
@@ -14,7 +15,7 @@
      * @param type $fileName the file in which this info is stored
      * @param type $params extra parameters.
      */
-    public function scan($params) {
+    public function scanAll($params) {
         /*$tracker_id = $params['tracker_id'];
         
         $sql = "SELECT field_name, alias FROM artifact_extra_field_list WHERE group_artifact_id = $1";
@@ -34,9 +35,9 @@
         $result     = array();
         
         $sql = "SELECT field_name, alias FROM artifact_extra_field_list WHERE group_artifact_id = $1";
-        $result = db_query_params($sql, array($tracker_id));
+        $dbRes = db_query_params($sql, array($tracker_id));
         
-        while ($arr = db_fetch_array($result)) {
+        while ($arr = db_fetch_array($dbRes)) {
             $result[] = array($arr['field_name'], $arr['alias']);
         }
         



More information about the evolvis-commits mailing list