[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r867 - GNUnet GNUnet/src/applications/fs GNUnet/src/applica
|
From: |
grothoff |
|
Subject: |
[GNUnet-SVN] r867 - GNUnet GNUnet/src/applications/fs GNUnet/src/applications/fs/ecrs GNUnet/src/applications/fs/fsui GNUnet/src/applications/fs/tools GNUnet/src/include GNUnet-docs/papers/ecrs gnunet-gtk/src |
|
Date: |
Sun, 5 Jun 2005 03:30:07 -0700 (PDT) |
Author: grothoff
Date: 2005-06-05 03:29:40 -0700 (Sun, 05 Jun 2005)
New Revision: 867
Modified:
GNUnet-docs/papers/ecrs/main.dvi
GNUnet-docs/papers/ecrs/main.log
GNUnet-docs/papers/ecrs/main.pdf
GNUnet-docs/papers/ecrs/main.ps
GNUnet/src/applications/fs/ecrs/upload.c
GNUnet/src/applications/fs/ecrs_core.c
GNUnet/src/applications/fs/fsui/upload.c
GNUnet/src/applications/fs/tools/gnunet-insert.c
GNUnet/src/include/gnunet_fsui_lib.h
GNUnet/todo
gnunet-gtk/src/search.c
gnunet-gtk/src/upload.c
Log:
bugfixes
Modified: GNUnet/src/applications/fs/ecrs/upload.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/upload.c 2005-06-04 13:35:02 UTC (rev
866)
+++ GNUnet/src/applications/fs/ecrs/upload.c 2005-06-05 10:29:40 UTC (rev
867)
@@ -270,10 +270,14 @@
pos))
goto FAILURE;
} else {
- fileBlockEncode(db,
- size,
- &chk.query,
- &value);
+ value = NULL;
+ if (OK !=
+ fileBlockEncode(db,
+ size + sizeof(DBlock),
+ &chk.query,
+ &value))
+ goto FAILURE;
+ GNUNET_ASSERT(value != NULL);
*value = *dblock; /* copy options! */
if (SYSERR == FS_insert(sock,
value)) {
Modified: GNUnet/src/applications/fs/ecrs_core.c
===================================================================
--- GNUnet/src/applications/fs/ecrs_core.c 2005-06-04 13:35:02 UTC (rev
866)
+++ GNUnet/src/applications/fs/ecrs_core.c 2005-06-05 10:29:40 UTC (rev
867)
@@ -52,7 +52,7 @@
Datastore_Value * val;
DBlock * db;
- GNUNET_ASSERT(len > sizeof(DBlock));
+ GNUNET_ASSERT(len >= sizeof(DBlock));
GNUNET_ASSERT((data!=NULL) && (query != NULL));
hash(&data[1], len - sizeof(DBlock), &hc);
hashToKey(&hc,
Modified: GNUnet/src/applications/fs/fsui/upload.c
===================================================================
--- GNUnet/src/applications/fs/fsui/upload.c 2005-06-04 13:35:02 UTC (rev
866)
+++ GNUnet/src/applications/fs/fsui/upload.c 2005-06-05 10:29:40 UTC (rev
867)
@@ -449,6 +449,7 @@
const char * filename,
unsigned int anonymityLevel,
int doIndex,
+ int doExtract,
const struct ECRS_MetaData * md,
const struct ECRS_URI * keyUri) {
FSUI_ThreadList * tl;
@@ -462,14 +463,17 @@
utc->expiration = cronTime(NULL) + 120 * cronYEARS;
utc->ctx = ctx;
utc->isRecursive = NO;
- utc->extractors = EXTRACTOR_loadDefaultLibraries();
- config = getConfigurationString("FS",
- "EXTRACTORS");
- if (config != NULL) {
- utc->extractors = EXTRACTOR_loadConfigLibraries(utc->extractors,
- config);
- FREE(config);
- }
+ if (doExtract) {
+ utc->extractors = EXTRACTOR_loadDefaultLibraries();
+ config = getConfigurationString("FS",
+ "EXTRACTORS");
+ if (config != NULL) {
+ utc->extractors = EXTRACTOR_loadConfigLibraries(utc->extractors,
+ config);
+ FREE(config);
+ }
+ } else
+ utc->extractors = NULL;
utc->globalUri = NULL;
utc->filename = NULL;
utc->main_filename = STRDUP(filename);
Modified: GNUnet/src/applications/fs/tools/gnunet-insert.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-insert.c 2005-06-04 13:35:02 UTC
(rev 866)
+++ GNUnet/src/applications/fs/tools/gnunet-insert.c 2005-06-05 10:29:40 UTC
(rev 867)
@@ -645,6 +645,7 @@
getConfigurationInt("FS",
"ANONYMITY-SEND"),
doIndex,
+ YES,
meta,
topURI);
ECRS_freeUri(topURI);
Modified: GNUnet/src/include/gnunet_fsui_lib.h
===================================================================
--- GNUnet/src/include/gnunet_fsui_lib.h 2005-06-04 13:35:02 UTC (rev
866)
+++ GNUnet/src/include/gnunet_fsui_lib.h 2005-06-05 10:29:40 UTC (rev
867)
@@ -479,6 +479,7 @@
const char * filename,
unsigned int anonymityLevel,
int doIndex,
+ int doExtract,
const struct ECRS_MetaData * md,
const struct ECRS_URI * keyUri);
Modified: GNUnet/todo
===================================================================
--- GNUnet/todo 2005-06-04 13:35:02 UTC (rev 866)
+++ GNUnet/todo 2005-06-05 10:29:40 UTC (rev 867)
@@ -12,6 +12,10 @@
- Missing Features:
* resolve "FIXME 0.7": only sqlite magic factor missing!
* #593 (gnunet-setup): php-ification for i18n [ Nils ]
+ * cache kblock-public/private keys
+ (terribly important, performance sucks already, but
+ without caching it'll be unbearable, espeically for
+ insertion of zip files with hundreds of files/keywords!)
- Additional (automated, make check-style) testing:
* gnunet-tracekit
* gap and economy
Modified: GNUnet-docs/papers/ecrs/main.dvi
===================================================================
(Binary files differ)
Modified: GNUnet-docs/papers/ecrs/main.log
===================================================================
--- GNUnet-docs/papers/ecrs/main.log 2005-06-04 13:35:02 UTC (rev 866)
+++ GNUnet-docs/papers/ecrs/main.log 2005-06-05 10:29:40 UTC (rev 867)
@@ -1,4 +1,4 @@
-This is pdfeTeX, Version 3.14159-1.10b-2.1 (Web2C 7.4.5) (format=pdflatex
2005.5.20) 1 JUN 2005 19:18
+This is pdfeTeX, Version 3.14159-1.10b-2.1 (Web2C 7.4.5) (format=pdflatex
2005.5.20) 3 JUN 2005 07:38
entering extended mode
**main.tex
(./main.tex{/usr/share/texmf/pdftex/config/pdftex.cfg}
@@ -581,4 +581,4 @@
pe1/bluesky/cm/cmr6.pfb></usr/share/texmf/fonts/type1/bluesky/cm/cmr7.pfb></usr
/share/texmf/fonts/type1/bluesky/cm/cmr10.pfb></usr/share/texmf/fonts/type1/blu
esky/cm/cmbx12.pfb>
-Output written on main.pdf (19 pages, 267239 bytes).
+Output written on main.pdf (19 pages, 267241 bytes).
Modified: GNUnet-docs/papers/ecrs/main.pdf
===================================================================
(Binary files differ)
Modified: GNUnet-docs/papers/ecrs/main.ps
===================================================================
--- GNUnet-docs/papers/ecrs/main.ps 2005-06-04 13:35:02 UTC (rev 866)
+++ GNUnet-docs/papers/ecrs/main.ps 2005-06-05 10:29:40 UTC (rev 867)
@@ -11,7 +11,7 @@
%DVIPSWebPage: (www.radicaleye.com)
%DVIPSCommandLine: dvips main.dvi -o main.ps
%DVIPSParameters: dpi=600, compressed
-%DVIPSSource: TeX output 2005.06.01:1918
+%DVIPSSource: TeX output 2005.06.03:0738
%%BeginProcSet: texc.pro
%!
/TeXDict 300 dict def TeXDict begin/N{def}def/B{bind def}N/S{exch}N/X{S
Modified: gnunet-gtk/src/search.c
===================================================================
--- gnunet-gtk/src/search.c 2005-06-04 13:35:02 UTC (rev 866)
+++ gnunet-gtk/src/search.c 2005-06-05 10:29:40 UTC (rev 867)
@@ -209,6 +209,9 @@
const struct ECRS_URI * uri,
GtkTreeRowReference * row) {
SearchList * list;
+ struct ECRS_URI * euri;
+ unsigned int count;
+ GtkTreeIter iter;
list = head;
while (list != NULL) {
@@ -224,6 +227,32 @@
addSearchResultToModel(info,
list->treeview,
row);
+
+ if (! gtk_tree_model_get_iter_first(GTK_TREE_MODEL(summary),
+ &iter)) {
+ BREAK();
+ return;
+ }
+
+ do {
+ gtk_tree_model_get(GTK_TREE_MODEL(summary),
+ &iter,
+ 1, &count,
+ 2, &euri,
+ -1);
+ if (ECRS_equalsUri(euri,
+ uri)) {
+ count++;
+ gtk_list_store_set(GTK_LIST_STORE(summary),
+ &iter,
+ 1, count,
+ -1);
+ return;
+ }
+
+ } while (gtk_tree_model_iter_next(GTK_TREE_MODEL(summary),
+ &iter));
+ BREAK();
}
void on_closeSearchButton_clicked(GtkWidget * searchPage,
@@ -234,6 +263,8 @@
struct ECRS_URI * uri;
SearchList * list;
SearchList * prev;
+ GtkTreeIter iter;
+ struct ECRS_URI * euri;
list = head;
prev = NULL;
@@ -247,7 +278,6 @@
uri = list->uri;
FSUI_stopSearch(ctx,
uri);
- ECRS_freeUri(uri);
if (prev == NULL)
head = list->next;
else
@@ -269,6 +299,30 @@
} else {
BREAK();
}
+
+ if (! gtk_tree_model_get_iter_first(GTK_TREE_MODEL(summary),
+ &iter)) {
+ BREAK();
+ ECRS_freeUri(uri);
+ return;
+ }
+ do {
+ gtk_tree_model_get(GTK_TREE_MODEL(summary),
+ &iter,
+ 2, &euri,
+ -1);
+ if (ECRS_equalsUri(euri,
+ uri)) {
+ gtk_list_store_remove(GTK_LIST_STORE(summary),
+ &iter);
+ ECRS_freeUri(euri);
+ ECRS_freeUri(uri);
+ return;
+ }
+ } while (gtk_tree_model_iter_next(GTK_TREE_MODEL(summary),
+ &iter));
+ ECRS_freeUri(uri);
+ BREAK();
}
static GtkWidget * makeResultFrame(GtkWidget ** treeview) {
@@ -446,6 +500,16 @@
list->uri
= uri;
head = list;
+
+ gtk_list_store_append(summary,
+ &iter);
+ gtk_list_store_set(summary,
+ &iter,
+ 0, tabtxt,
+ 1, 0,
+ 2, ECRS_dupUri(uri),
+ -1);
+
label = gtk_label_new(tabtxt);
gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
list->searchpage,
Modified: gnunet-gtk/src/upload.c
===================================================================
--- gnunet-gtk/src/upload.c 2005-06-04 13:35:02 UTC (rev 866)
+++ gnunet-gtk/src/upload.c 2005-06-05 10:29:40 UTC (rev 867)
@@ -118,7 +118,7 @@
&child,
&iter);
gtk_tree_store_set(GTK_TREE_STORE(summary),
- &iter,
+ &child,
0, filename,
1, progress,
2, NULL,
@@ -637,6 +637,7 @@
getConfigurationInt("FS",
"ANONYMITY"), /* FIXME */
doIndex,
+ NO,
meta,
keywordURI);
}
@@ -739,7 +740,6 @@
GTK_TREE_MODEL(model));
gtk_combo_box_entry_set_text_column(GTK_COMBO_BOX_ENTRY(uploadEntry),
0);
-
}
void fs_upload_stop() {
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r867 - GNUnet GNUnet/src/applications/fs GNUnet/src/applications/fs/ecrs GNUnet/src/applications/fs/fsui GNUnet/src/applications/fs/tools GNUnet/src/include GNUnet-docs/papers/ecrs gnunet-gtk/src,
grothoff <=