[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r1629 - in Extractor: . src/main
From: |
grothoff |
Subject: |
[GNUnet-SVN] r1629 - in Extractor: . src/main |
Date: |
Mon, 8 Aug 2005 12:16:52 -0700 (PDT) |
Author: grothoff
Date: 2005-08-08 12:16:47 -0700 (Mon, 08 Aug 2005)
New Revision: 1629
Modified:
Extractor/ChangeLog
Extractor/src/main/extractor.c
Log:
addKeyword2
Modified: Extractor/ChangeLog
===================================================================
--- Extractor/ChangeLog 2005-08-08 17:34:04 UTC (rev 1628)
+++ Extractor/ChangeLog 2005-08-08 19:16:47 UTC (rev 1629)
@@ -1,3 +1,6 @@
+Mon Aug 8 12:18:44 PDT 2005
+ Somehow addKeyword2 got lost. Added (again?).
+
Thu Jul 14 18:52:17 CEST 2005
Bugfixes in exiv2 extractor fixing remaining issues.
Changed plugins to not use filename but always only
Modified: Extractor/src/main/extractor.c
===================================================================
--- Extractor/src/main/extractor.c 2005-08-08 17:34:04 UTC (rev 1628)
+++ Extractor/src/main/extractor.c 2005-08-08 19:16:47 UTC (rev 1629)
@@ -663,6 +663,38 @@
return result;
}
+
+
+/**
+ * Extract keywords from a buffer in memory
+ * using the available extractors.
+ *
+ * @param extractor the list of extractor libraries
+ * @param data the data of the file
+ * @param size the number of bytes in data
+ * @return the list of keywords found in the file, NULL if none
+ * were found (or other errors)
+ */
+EXTRACTOR_KeywordList *
+EXTRACTOR_getKeywords2(EXTRACTOR_ExtractorList * extractor,
+ const char * data,
+ size_t size) {
+ EXTRACTOR_KeywordList * result;
+
+ if (data == NULL)
+ return NULL;
+ result = NULL;
+ while (extractor != NULL) {
+ result = extractor->extractMethod(NULL,
+ (char*)data,
+ size,
+ result,
+ extractor->options);
+ extractor = extractor->next;
+ }
+ return result;
+}
+
static void
removeKeyword (const char *keyword,
const EXTRACTOR_KeywordType type,
@@ -926,7 +958,6 @@
size_t i;
unsigned int markers[8]; /* 256 bits */
unsigned char marker;
- char * format;
/* encode! */
binary = malloc(2 + size + (size+256) / 254);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r1629 - in Extractor: . src/main,
grothoff <=