1 files changed, 17 insertions, 8 deletions

diff --git a/src/upload.c b/src/upload.c
index 0e3a3edc..d8bf831c 100644
--- a/src/upload.c
+++ b/src/upload.c
@@ -376,6 +376,7 @@ void on_fsinsertuploadbutton_clicked(gpointer dummy,
   EXTRACTOR_KeywordType type;
   char * config;
   struct ECRS_URI * keywordURI;
+  struct ECRS_URI * gkeywordURI;
   const char * stype;
   GdkPixbuf * pixbuf;
   GdkPixbufLoader * loader;
@@ -385,6 +386,7 @@ void on_fsinsertuploadbutton_clicked(gpointer dummy,
   char ** keywords;
   unsigned int kpos;
   unsigned int ksize;
+  const char * filenamerest;
 
   extractors = EXTRACTOR_loadDefaultLibraries();
   config = getConfigurationString("FS",
@@ -450,6 +452,13 @@ void on_fsinsertuploadbutton_clicked(gpointer dummy,
   ECRS_extractMetaData(meta,
                        filename,
                        extractors);
+  filenamerest = &filename[strlen(filename)-1];
+  while ( (filenamerest > filename) &&
+          (filenamerest[-1] != DIR_SEPARATOR) )
+    filenamerest--;
+  ECRS_addToMetaData(meta,
+                     EXTRACTOR_FILENAME,
+                     filenamerest);
   ECRS_getMetaData(meta,
                    (ECRS_MetaDataIterator) &publishMetaData,
                    metamodel);
@@ -580,13 +589,12 @@ void on_fsinsertuploadbutton_clicked(gpointer dummy,
               marker++;
               GNUNET_ASSERT(marker != 0);
             }
+            /* recode */
+            binary[wpos++] = marker;
+            for (i=pos;i<end;i++)
+              binary[wpos++] = thumb[i] == 0 ? marker : thumb[i];
+            pos = end;
           }
-          /* recode */
-          binary[wpos++] = marker;
-          for (i=pos;i<end;i++)
-            binary[wpos++] = thumb[i] == 0 ? marker : thumb[i];
-          pos = end;
-        
           binary[wpos++] = 0; /* 0-termination! */
           free(thumb);
           ECRS_addToMetaData(meta,
@@ -594,7 +602,6 @@ void on_fsinsertuploadbutton_clicked(gpointer dummy,
                              binary);
           FREE(binary); 
         }
-        g_object_unref(pixbuf);
       }
     }
     keywords = NULL;
@@ -628,13 +635,15 @@ void on_fsinsertuploadbutton_clicked(gpointer dummy,
          0);
   
     if (doRec) {
+      gkeywordURI = ECRS_stringToUri(ECRS_URI_PREFIX
+                                     ECRS_SEARCH_INFIX);      
       FSUI_uploadAll(ctx,
                      filename,
                      getConfigurationInt("FS",
                                          "ANONYMITY"), /* FIXME */
                      doIndex,
                      meta,
-                     keywordURI,
+                     gkeywordURI,
                      keywordURI);
     } else {
       FSUI_upload(ctx,