[GNUnet-SVN] r759 - in Extractor/src: include main

[heiko]

Author: heiko
Date: 2005-05-07 11:40:15 -0700 (Sat, 07 May 2005)
New Revision: 759

Removed:
   Extractor/src/main/org_ovmj_libextractor_Extractor.h
Modified:
   Extractor/src/include/extractor.h
   Extractor/src/main/Makefile.am
   Extractor/src/main/extract.c
Log:
Commit rest of changes.


Modified: Extractor/src/include/extractor.h
===================================================================
--- Extractor/src/include/extractor.h   2005-05-07 18:37:37 UTC (rev 758)
+++ Extractor/src/include/extractor.h   2005-05-07 18:40:15 UTC (rev 759)
@@ -149,7 +149,8 @@
 typedef EXTRACTOR_KeywordList * (*ExtractMethod)(const char * filename,
                                                 char * data,
                                                 size_t filesize,
-                                                EXTRACTOR_KeywordList * next);
+                                                EXTRACTOR_KeywordList * next,
+                                                const char * options);
 
 /**
  * Linked list of extractor helper-libraries. An application
@@ -165,6 +166,7 @@
   char * libname;
   ExtractMethod extractMethod;
   struct EXTRACTOR_Extractor * next;
+  char * options;
 } EXTRACTOR_ExtractorList;
 
 /**
@@ -188,7 +190,8 @@
  * Load multiple libraries as specified by the user.
  * @param config a string given by the user that defines which
  *        libraries should be loaded. Has the format
- *        "[[-]LIBRARYNAME[:[-]LIBRARYNAME]]*". For example,
+ *        "[[-]LIBRARYNAME[(options)][:[-]LIBRARYNAME[(options)]]]*".
+ *        For example,
  *        libextractor_mp3.so:libextractor_ogg.so loads the
  *        mp3 and the ogg library. The '-' before the LIBRARYNAME
  *        indicates that the library should be added to the end

Modified: Extractor/src/main/Makefile.am
===================================================================
--- Extractor/src/main/Makefile.am      2005-05-07 18:37:37 UTC (rev 758)
+++ Extractor/src/main/Makefile.am      2005-05-07 18:40:15 UTC (rev 759)
@@ -54,8 +54,6 @@
   getopt.h \
   getopt1.c 
 
-
-all-local:
-       python libextractor_python_setup.py build
 install-exec-local:
+       python libextractor_python_setup.py build
        python libextractor_python_setup.py install --prefix=$(PYTHON_PREFIX)

Modified: Extractor/src/main/extract.c
===================================================================
--- Extractor/src/main/extract.c        2005-05-07 18:37:37 UTC (rev 758)
+++ Extractor/src/main/extract.c        2005-05-07 18:40:15 UTC (rev 759)
@@ -575,7 +575,6 @@
     extractors = EXTRACTOR_addLibraryLast(extractors,
                                          "libextractor_split");
 
-
   if (verbose == YES)
     {
       /* print list of all used extractors */

Deleted: Extractor/src/main/org_ovmj_libextractor_Extractor.h
===================================================================
--- Extractor/src/main/org_ovmj_libextractor_Extractor.h        2005-05-07 
18:37:37 UTC (rev 758)
+++ Extractor/src/main/org_ovmj_libextractor_Extractor.h        2005-05-07 
18:40:15 UTC (rev 759)
@@ -1,77 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class org_ovmj_libextractor_Extractor */
-
-#ifndef _Included_org_ovmj_libextractor_Extractor
-#define _Included_org_ovmj_libextractor_Extractor
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     org_ovmj_libextractor_Extractor
- * Method:    loadDefaultInternal
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL 
Java_org_ovmj_libextractor_Extractor_loadDefaultInternal
-  (JNIEnv *, jclass);
-
-/*
- * Class:     org_ovmj_libextractor_Extractor
- * Method:    unloadInternal
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_org_ovmj_libextractor_Extractor_unloadInternal
-  (JNIEnv *, jclass, jlong);
-
-/*
- * Class:     org_ovmj_libextractor_Extractor
- * Method:    extractInternal
- * Signature: (JLjava/lang/String;)J
- */
-JNIEXPORT jlong JNICALL Java_org_ovmj_libextractor_Extractor_extractInternal
-  (JNIEnv *, jclass, jlong, jstring);
-
-/*
- * Class:     org_ovmj_libextractor_Extractor
- * Method:    freeInternal
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_org_ovmj_libextractor_Extractor_freeInternal
-  (JNIEnv *, jclass, jlong);
-
-/*
- * Class:     org_ovmj_libextractor_Extractor
- * Method:    typeInternal
- * Signature: (J)I
- */
-JNIEXPORT jint JNICALL Java_org_ovmj_libextractor_Extractor_typeInternal
-  (JNIEnv *, jclass, jlong);
-
-/*
- * Class:     org_ovmj_libextractor_Extractor
- * Method:    keywordInternal
- * Signature: (J)Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_org_ovmj_libextractor_Extractor_keywordInternal
-  (JNIEnv *, jclass, jlong);
-
-/*
- * Class:     org_ovmj_libextractor_Extractor
- * Method:    nextInternal
- * Signature: (J)J
- */
-JNIEXPORT jlong JNICALL Java_org_ovmj_libextractor_Extractor_nextInternal
-  (JNIEnv *, jclass, jlong);
-
-/*
- * Class:     org_ovmj_libextractor_Extractor
- * Method:    getTypeAsStringInternal
- * Signature: (I)Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL 
Java_org_ovmj_libextractor_Extractor_getTypeAsStringInternal
-  (JNIEnv *, jclass, jint);
-
-#ifdef __cplusplus
-}
-#endif
-#endif