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

[gnunet]

Author: grothoff
Date: 2009-12-20 21:04:49 +0100 (Sun, 20 Dec 2009)
New Revision: 9827

Modified:
   Extractor/src/include/extractor.h
   Extractor/src/main/extractor_metatypes.c
   Extractor/src/plugins/tiff_extractor.c
Log:
more tag clean up

Modified: Extractor/src/include/extractor.h
===================================================================
--- Extractor/src/include/extractor.h   2009-12-20 19:55:40 UTC (rev 9826)
+++ Extractor/src/include/extractor.h   2009-12-20 20:04:49 UTC (rev 9827)
@@ -308,53 +308,16 @@
     EXTRACTOR_METATYPE_MUSICIAN_CREDITS_LIST = 170,
     EXTRACTOR_METATYPE_MOOD = 171, 
     EXTRACTOR_METATYPE_SUBTITLE = 172, 
+    /* GNUnet specific values (never extracted) */
+    EXTRACTOR_METATYPE_GNUNET_DISPLAY_TYPE = 173,
+    EXTRACTOR_METATYPE_GNUNET_FULL_DATA = 174,
+    EXTRACTOR_METATYPE_RATING = 175,
+    EXTRACTOR_METATYPE_ORGANIZATION = 176,
+    EXTRACTOR_METATYPE_RIPPER = 177,
+    EXTRACTOR_METATYPE_PRODUCER = 178,
+    EXTRACTOR_METATYPE_GROUP = 179,
 
-    /* fixme: used up to here! */
-
-    EXTRACTOR_METATYPE_MUSIC_CD_IDENTIFIER = 117,
-
-    
-    EXTRACTOR_METATYPE_SCALE = 108,
-
-
-
-    /* FIXME: transcribe & renumber those below */
-    EXTRACTOR_METATYPE_USED_FONTS = 37,
-
-
-    /* numeric metrics */
-    EXTRACTOR_METATYPE_RATING = 145,
-    EXTRACTOR_METATYPE_PRIORITY = 60,
-
-    /* gnunet specific attributes */
-    EXTRACTOR_METATYPE_GNUNET_DISPLAY_TYPE = 135,
-    EXTRACTOR_METATYPE_GNUNET_ECBC_URI = 136,
-
-
-    /* misc (see if these are still needed...) */
-
-    EXTRACTOR_METATYPE_GENERATOR = 103,
-
-    EXTRACTOR_METATYPE_FULL_DATA = 137,
-
-    EXTRACTOR_METATYPE_ORGANIZATION = 15,
-    EXTRACTOR_METATYPE_RELATION = 24,
-    EXTRACTOR_METATYPE_COVERAGE = 25,
-    EXTRACTOR_METATYPE_SOFTWARE = 26,
-    EXTRACTOR_METATYPE_TRANSLATED = 29,
-    EXTRACTOR_METATYPE_PRODUCER = 33,
-    EXTRACTOR_METATYPE_CREATED_FOR = 39,
-    EXTRACTOR_METATYPE_RELEASE = 41,
-    EXTRACTOR_METATYPE_GROUP = 42,
-    EXTRACTOR_METATYPE_OWNER = 66,
-    EXTRACTOR_METATYPE_MEDIA_TYPE = 68,
-    EXTRACTOR_METATYPE_SECURITY = 97,
-    EXTRACTOR_METATYPE_FULL_NAME = 113,
-    EXTRACTOR_METATYPE_LINK = 116,
-    EXTRACTOR_METATYPE_TIME = 122,
-    EXTRACTOR_METATYPE_TELEVISION_SYSTEM = 126,
-    EXTRACTOR_METATYPE_HARDWARE_DEPENDENCY = 129,
-    EXTRACTOR_METATYPE_RIPPER = 130,
+    EXTRACTOR_METATYPE_LAST = 180
   };
 
 

Modified: Extractor/src/main/extractor_metatypes.c
===================================================================
--- Extractor/src/main/extractor_metatypes.c    2009-12-20 19:55:40 UTC (rev 
9826)
+++ Extractor/src/main/extractor_metatypes.c    2009-12-20 20:04:49 UTC (rev 
9827)
@@ -417,140 +417,24 @@
     gettext_noop ("keywords reflecting the mood of the piece") }, 
   { gettext_noop ("subtitle"),
     gettext_noop ("subtitle of this part") }, 
-  { gettext_noop (""),
-    gettext_noop ("") }, 
-  { gettext_noop (""),
-    gettext_noop ("") }, 
-#if 0
-  
-  gettext_noop("author"),
-  gettext_noop("artist"), /* 5 */
-  gettext_noop("description"),
-  gettext_noop("date"),
-  gettext_noop("publisher"),
-  gettext_noop("language"), /* 10 */
-  gettext_noop("album"),
-  gettext_noop("genre"),
-  gettext_noop("location"),
-  gettext_noop("version"),
-  gettext_noop("organization"), /* 15 */
-  gettext_noop("copyright"),
-  gettext_noop("subject"),
-  gettext_noop("keywords"),
-  gettext_noop("contributor"),
-  gettext_noop("resource-type"), /* 20 */
-  gettext_noop("format"),
-  gettext_noop("resource-identifier"),
-  gettext_noop("source"),
-  gettext_noop("relation"),
-  gettext_noop("coverage"), /* 25 */
-  gettext_noop("software"),
-  gettext_noop("disclaimer"),
-  gettext_noop("warning"),
-  gettext_noop("translated"),
-  gettext_noop("creation date"), /* 30 */
-  gettext_noop("modification date"),
-  gettext_noop("creator"),
-  gettext_noop("producer"),
-  gettext_noop("page count"),
-  gettext_noop("page orientation"), /* 35 */
-  gettext_noop("paper size"),
-  gettext_noop("used fonts"),
-  gettext_noop("page order"),
-  gettext_noop("created for"),
-  gettext_noop("magnification"), /* 40 */
-  gettext_noop("release"),
-  gettext_noop("group"),
-  gettext_noop("size"),
-  gettext_noop("summary"),
-  gettext_noop("packager"), /* 45 */
-  gettext_noop("vendor"),
-  gettext_noop("license"),
-  gettext_noop("distribution"),
-  gettext_noop("build-host"),
-  gettext_noop("operating system"), /* 50 */
-  gettext_noop("dependency"),
-  gettext_noop("resolution"),
-  gettext_noop("category"),
-  gettext_noop("book title"),
-  gettext_noop("priority"), /* 60 */
-  gettext_noop("conflicts"),
-  gettext_noop("replaces"),
-  gettext_noop("provides"),
-  gettext_noop("conductor"),
-  gettext_noop("interpreter"), /* 65 */
-  gettext_noop("owner"),
-  gettext_noop("lyrics"),
-  gettext_noop("media type"),
-  gettext_noop("contact"),
-  gettext_noop("binary thumbnail data"), /* 70 */
-  gettext_noop("publication date"),
-  gettext_noop("camera make"),
-  gettext_noop("camera model"),
-  gettext_noop("exposure"),
-  gettext_noop("aperture"), /* 75 */
-  gettext_noop("exposure bias"),
-  gettext_noop("flash"),
-  gettext_noop("flash bias"),
-  gettext_noop("focal length"),
-  gettext_noop("focal length (35mm equivalent)"), /* 80 */
-  gettext_noop("iso speed"),
-  gettext_noop("exposure mode"),
-  gettext_noop("metering mode"),
-  gettext_noop("macro mode"),
-  gettext_noop("image quality"), /* 85 */
-  gettext_noop("white balance"),
-  gettext_noop("orientation"),
-  gettext_noop("template"),
-  gettext_noop("split"),
-  gettext_noop("product version"), /* 90 */
-  gettext_noop("last saved by"),
-  gettext_noop("last printed"),
-  gettext_noop("word count"),
-  gettext_noop("character count"),
-  gettext_noop("total editing time"), /* 95 */
-  gettext_noop("thumbnails"),
-  gettext_noop("security"),
-  gettext_noop("created by software"),
-  gettext_noop("modified by software"),
-  gettext_noop("revision history"), /* 100 */
-  gettext_noop("company"),
-  gettext_noop("generator"),
-  gettext_noop("character set"),
-  gettext_noop("line count"), /* 105 */
-  gettext_noop("paragraph count"),
-  gettext_noop("editing cycles"),
-  gettext_noop("scale"),
-  gettext_noop("manager"),
-  gettext_noop(/* movie director */"director"), /* 110 */
-  gettext_noop("duration"),
-  gettext_noop("information"),
-  gettext_noop("full name"),
-  gettext_noop("chapter"),
-  gettext_noop("year"), /* 115 */
-  gettext_noop("link"),
-  gettext_noop("music CD identifier"),
-  gettext_noop("play counter"),
-  gettext_noop("popularity meter"),
-  gettext_noop("content type"), /* 120 */
-  gettext_noop("encoded by"),
-  gettext_noop("time"),
-  gettext_noop("musician credits list"),
-  gettext_noop("mood"),
-  gettext_noop("format version"), /* 125 */
-  gettext_noop("television system"),
-  gettext_noop("song count"),
-  gettext_noop("hardware dependency"),
-  gettext_noop("ripper"), /* 130 */
-  gettext_noop("filesize"),
-  gettext_noop("track number"),
-  gettext_noop("disc number"), 
-  gettext_noop("preferred display style (GNUnet)"), /* 135 */
-  gettext_noop("GNUnet URI of ECBC data"),
-  gettext_noop("Complete file data (for non-binary files only)"),
-  gettext_noop("rating"), /* 145 */
-
-#endif
+  { gettext_noop ("display type"),
+    gettext_noop ("what rendering method should be used to display this item") 
}, 
+  { gettext_noop ("full data"),
+    gettext_noop ("entry that contains the full, original binary data (not 
really meta data)") }, 
+  /* 175 */
+  { gettext_noop ("rating"),
+    gettext_noop ("rating of the content") },
+  { gettext_noop ("organization"),
+    gettext_noop ("") },
+  { gettext_noop ("ripper"), /* any difference to "encoded by"? */
+    gettext_noop ("") },
+  { gettext_noop ("producer"), 
+    gettext_noop ("") },
+  { gettext_noop ("group"), 
+    gettext_noop ("name of the group or band") },
+  /* 180 */
+  { gettext_noop ("last"),
+    gettext_noop ("") }
 };
 
 /**

Modified: Extractor/src/plugins/tiff_extractor.c
===================================================================
--- Extractor/src/plugins/tiff_extractor.c      2009-12-20 19:55:40 UTC (rev 
9826)
+++ Extractor/src/plugins/tiff_extractor.c      2009-12-20 20:04:49 UTC (rev 
9827)
@@ -207,7 +207,7 @@
                 }
               break;
             case TAG_SOFTWARE:
-              if (0 != addASCII (proc, proc_cls, data, size, &entry, 
EXTRACTOR_METATYPE_SOFTWARE))
+              if (0 != addASCII (proc, proc_cls, data, size, &entry, 
EXTRACTOR_METATYPE_CREATED_BY_SOFTWARE))
                return 1;
               break;
             case TAG_ARTIST: