Commit emails of the iDok project

["AFS account Florian Huebner" <huebner AT savannah.psi.ch>]

Author: huebner
Date: Thu Sep 11 14:21:03 2008
New Revision: 212

Log:
Fixed VirtualFolder problems similar to issue #IDO-40

Modified:
   trunk/java/ch/idok/qtgui/FolderTree.java
   trunk/java/ch/idok/qtgui/MainWindow.java
   trunk/java/ch/idok/qtgui/SearchController.java

Modified: trunk/java/ch/idok/qtgui/FolderTree.java
==============================================================================
--- trunk/java/ch/idok/qtgui/FolderTree.java    (original)
+++ trunk/java/ch/idok/qtgui/FolderTree.java    Thu Sep 11 14:21:03 2008
@@ -58,7 +58,7 @@
  */
 public class FolderTree extends QObject {
 
-    public Signal2<String, String> virtualFolderOpened = new Signal2<String, 
String>();
+    public Signal3<String, String, String> virtualFolderOpened = new 
Signal3<String, String, String>();
 
     public Signal1<String> searchWithFolderTriggered = new Signal1<String>();
 
@@ -255,10 +255,9 @@
                 upstreamFolder = upstreamFolder.parent();
             }
             // reached real folder level - add path condition
+            String folder = "";
             if (!upstreamFolder.text(0).equals("/")) {
-                searchExp = "auto\\:relpath:"
-                        + buildFullPath(upstreamFolder).substring(1) + "* 
AND "
-                        + searchExp;
+                folder = buildFullPath(upstreamFolder).substring(1);
             }
 
             // this will trigger the display of the search results
@@ -267,7 +266,8 @@
             // Searchexpression is full search expression up to current 
folder
             // depth
             // newMetaDataField defines how to create the new folder level
-            virtualFolderOpened.emit(searchExp, newMetaDataField);
+            virtualFolderOpened.emit(searchExp, newMetaDataField, folder);
+            folder = "";
         } else {
             // First check if this parent CONTAINS virtual folders.
             // The definition of the virtual folders are currently stored

Modified: trunk/java/ch/idok/qtgui/MainWindow.java
==============================================================================
--- trunk/java/ch/idok/qtgui/MainWindow.java    (original)
+++ trunk/java/ch/idok/qtgui/MainWindow.java    Thu Sep 11 14:21:03 2008
@@ -336,7 +336,7 @@
         vfc_.virtualFolderCreated.connect(ft_, "openFolder()");
 
         // opening virtual folders activates a search operation
-        ft_.virtualFolderOpened.connect(sc_, 
"getSearchResults(String,String)");
+        ft_.virtualFolderOpened.connect(sc_, 
"getSearchResults(String,String,String)");
         ft_.searchWithFolderTriggered.connect(sc_,
                 "prepareSearchWithinFolder(String)");
         ft_.searchSinceDateTriggered.connect(sc_,

Modified: trunk/java/ch/idok/qtgui/SearchController.java
==============================================================================
--- trunk/java/ch/idok/qtgui/SearchController.java      (original)
+++ trunk/java/ch/idok/qtgui/SearchController.java      Thu Sep 11 14:21:03 
2008
@@ -123,6 +123,15 @@
         header_.add("Date committed");
         header_.add("Revision");
     }
+    
+    public final void getSearchResults(String shortSearchExpression,String 
metaData,String folder){
+        if (folder.equals("")) {
+            getSearchResults(shortSearchExpression, metaData);
+        }else{
+            prepareSearchWithinFolder(folder);
+            getSearchResults(shortSearchExpression, metaData); 
+        }
+    }
 
     /**
      * Fill search widget with results from search or just build up next 
virtual