fixing namespace search code

3 files changed, 34 insertions, 22 deletions

diff --git a/po/Makefile.in b/po/Makefile.in
index aa13ca11..69a88b6f 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -20,7 +20,7 @@ srcdir = .
 top_srcdir = ..
 
 
-prefix = /home/grothoff/
+prefix = /home/grothoff
 exec_prefix = ${prefix}
 datadir = ${prefix}/share
 localedir = $(datadir)/locale
diff --git a/src/plugins/fs/namespace.c b/src/plugins/fs/namespace.c
index 5a4056ae..175f4f6a 100644
--- a/src/plugins/fs/namespace.c
+++ b/src/plugins/fs/namespace.c
@@ -161,6 +161,7 @@ static GtkWidget * makeNamespaceFrame(GtkWidget ** treeview,
  */
 static int updateView(const ECRS_FileInfo * fi,
                       const HashCode512 * key,
+                      int isRoot,
                       void * closure) {
   GtkTreeModel * model = GTK_TREE_MODEL(closure);
   struct ECRS_URI * euri;
diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index bf585fce..60eecbf1 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.c
@@ -199,8 +199,10 @@ void on_namespaceRatingSpinButton_changed(GtkWidget * dummy,
   GtkTreeModel * model;
   GtkTreeIter iter;
   char * encStr;
+  char * description;
   int rating;
-
+  int newrating;
+  
   spin
     = glade_xml_get_widget(getMainXML(),
                            "namespaceRatingSpinButton");
@@ -212,24 +214,33 @@ void on_namespaceRatingSpinButton_changed(GtkWidget * dummy,
                                             &iter)) {   
     gtk_tree_model_get(model,
                        &iter,
+                       NS_SEARCH_DESCRIPTION, &description,
                        NS_SEARCH_ENCNAME, &encStr,
                        NS_SEARCH_RATING, &rating,
-                       -1);
-    if (0 == strcmp(encStr,
-                    _("globally"))) {
-      BREAK(); /* spin button should be insensitive! */
+                       -1);    
+    if ( (description != NULL) &&
+         (0 == strcmp(description,
+                      _("globally"))) ) {
+      /* just to be sure */
       gtk_widget_set_sensitive(spin,
                                FALSE);
     } else {
-      FSUI_rankNamespace(ctx,
-                         encStr,
-                         rating - FSUI_rankNamespace(ctx,
-                                                     encStr,
-                                                     0));
-      gtk_list_store_set(GTK_LIST_STORE(model),
-                         &iter,
-                         NS_SEARCH_RATING, rating,
-                         -1);      
+      if (encStr != NULL) {
+        newrating = gtk_spin_button_get_value(GTK_SPIN_BUTTON(spin));
+        rating = FSUI_rankNamespace(ctx,
+                                    encStr,
+                                    newrating - rating);
+        if (rating != newrating) {
+          /* concurrent modification? */
+          gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin),
+                                    rating);
+          BREAK();      
+        }
+        gtk_list_store_set(GTK_LIST_STORE(model),
+                           &iter,
+                           NS_SEARCH_RATING, rating,
+                           -1);
+      }      
     }   
   } else {
     /* FIXME: if enc2hash succeeds, we may want to keep this 
@@ -255,6 +266,7 @@ void on_searchNamespaceComboBoxEntry_changed(GtkWidget * dummy,
   GtkTreeIter iter;
   int rating;
   char * encStr;
+  char * descStr;
   HashCode512 ns;
   HashCode512 root;
   EncName enc;
@@ -269,22 +281,21 @@ void on_searchNamespaceComboBoxEntry_changed(GtkWidget * dummy,
   if (TRUE == gtk_combo_box_get_active_iter(GTK_COMBO_BOX(ncbe),
                                             &iter)) {
     encStr = NULL;
+    descStr = NULL;
     gtk_tree_model_get(model,
                        &iter,
+                       NS_SEARCH_DESCRIPTION, &descStr,
                        NS_SEARCH_ENCNAME, &encStr,
                        NS_SEARCH_RATING, &rating,
                        -1);
-           
-    if (!encStr)
-      return;
-           
-    if (0 == strcmp(encStr,
-                    _("globally"))) {
+    if ( (descStr != NULL) &&
+         (0 == strcmp(descStr,
+                      _("globally"))) ) {
       gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin),
                                 0);
       gtk_widget_set_sensitive(spin,
                                FALSE);
-    } else {
+    } else if (encStr != NULL) {
       enc2hash(encStr,
                &ns);
       gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin),