From kde-commits  Mon Apr 30 22:28:04 2007
From: Evgeny Egorochkin <phreedom.stdin () gmail ! com>
Date: Mon, 30 Apr 2007 22:28:04 +0000
To: kde-commits
Subject: kdesupport/strigi/src/streamanalyzer (silent)
Message-Id: <1177972084.834016.31556.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=117797210830557

SVN commit 659859 by evgeny:

SVN_SILENT Ontology extensions.


 M  +4 -4      endanalyzers/oleendanalyzer.cpp  
 M  +2 -0      fieldproperties/CMakeLists.txt  
 M  +0 -15     fieldproperties/strigi_documentstats.fieldproperties  
 A             fieldproperties/strigi_source_code.fieldproperties  
 A             fieldproperties/strigi_text.fieldproperties  
 M  +3 -3      lineplugins/cpplineanalyzer.cpp  
 M  +3 -3      odfsaxanalyzer.cpp  


--- trunk/kdesupport/strigi/src/streamanalyzer/endanalyzers/oleendanalyzer.cpp #659858:659859
@@ -55,13 +55,13 @@
     // register the fields for the Document Summary Information Stream
     key.assign(docSummaryKey, 16);
     m = &fieldsMaps[key];
-    r = reg.registerField("category", FieldRegister::stringType, 1, 0);
+    r = reg.registerField("OLE.category", FieldRegister::stringType, 1, 0);
     if (r) (*m)[2] = r;
-    r = reg.registerField("presentationtarget",FieldRegister::stringType, 1, 0);
+    r = reg.registerField("OLE.presentationtarget",FieldRegister::stringType, 1, 0);
     if (r) (*m)[3] = r;
-    r = reg.registerField("manager", FieldRegister::stringType, 1, 0);
+    r = reg.registerField("OLE.manager", FieldRegister::stringType, 1, 0);
     if (r) (*m)[14] = r;
-    r = reg.registerField("company", FieldRegister::stringType, 1, 0);
+    r = reg.registerField("OLE.company", FieldRegister::stringType, 1, 0);
     if (r) (*m)[15] = r;
 }
 const map<int, const RegisteredField*>*
--- trunk/kdesupport/strigi/src/streamanalyzer/fieldproperties/CMakeLists.txt #659858:659859
@@ -20,6 +20,8 @@
 	strigi_photo.fieldproperties
 	strigi_container.fieldproperties
 	strigi_cursor.fieldproperties
+	strigi_source_code.fieldproperties
+	strigi_text.fieldproperties
 
 	DESTINATION share/apps/strigi/fieldproperties
 )
--- trunk/kdesupport/strigi/src/streamanalyzer/fieldproperties/strigi_documentstats.fieldproperties #659858:659859
@@ -1,18 +1,4 @@
 [Field]
-Uri=document.stats.char_count
-Name=Character count
-TypeUri=integer
-Description=Document character count
-Comment=per ODF spec
-
-[Field]
-Uri=document.stats.word_count
-Name=Word count
-TypeUri=integer
-Description=Document word count
-Comment=per ODF spec
-
-[Field]
 Uri=document.stats.paragraph_count
 Name=Paragraph count
 TypeUri=integer
@@ -46,4 +32,3 @@
 TypeUri=integer
 Description=Document image count
 Comment=per ODF spec
-
--- trunk/kdesupport/strigi/src/streamanalyzer/lineplugins/cpplineanalyzer.cpp #659858:659859
@@ -31,9 +31,9 @@
 CppLineAnalyzerFactory::registerFields(FieldRegister& reg) {
     includeField = reg.registerField("TODO_include", FieldRegister::stringType, 0, 0);
     classField = reg.registerField("TODO_class", FieldRegister::stringType, 0, 0);
-    codeLinesField = reg.registerField("TODO_codelines", FieldRegister::integerType, 1, 0);
-    commentLinesField = reg.registerField("TODO_commentlines", FieldRegister::integerType, 1, 0);
-    totalLinesField = reg.registerField("TODO_totallines", FieldRegister::integerType, 1, 0);
+    codeLinesField = reg.registerField("source_code.stats.code_line_count", FieldRegister::integerType, 1, 0);
+    commentLinesField = reg.registerField("source_code.stats.comment_line_count", FieldRegister::integerType, 1, 0);
+    totalLinesField = reg.registerField("text.stats.line_count", FieldRegister::integerType, 1, 0);
     includesField = reg.registerField("TODO_includes", FieldRegister::integerType, 1, 0);
 }
 
--- trunk/kdesupport/strigi/src/streamanalyzer/odfsaxanalyzer.cpp #659858:659859
@@ -43,12 +43,12 @@
     descriptionField = reg.registerField("content.description", FieldRegister::stringType, 1, 0);
     languageField = reg.registerField("content.language", FieldRegister::stringType, 1, 0);
     keywordField = reg.registerField("content.keyword", FieldRegister::stringType, 1, 0);
-    generatorField = reg.registerField("generator", FieldRegister::stringType, 1, 0);
+    generatorField = reg.registerField("content.generator", FieldRegister::stringType, 1, 0);
     tablecountField = reg.registerField("document.stats.table_count", FieldRegister::stringType, 1, 0);
     pagecountField = reg.registerField("document.stats.page_count", FieldRegister::stringType, 1, 0);
     paragcountField = reg.registerField("document.stats.paragraph_count", FieldRegister::stringType, 1, 0);
-    wordcountField = reg.registerField("document.stats.word_count", FieldRegister::stringType, 1, 0);
-    charcountField = reg.registerField("document.stats.char_count", FieldRegister::stringType, 1, 0);
+    wordcountField = reg.registerField("text.stats.word_count", FieldRegister::stringType, 1, 0);
+    charcountField = reg.registerField("text.stats.char_count", FieldRegister::stringType, 1, 0);
     objectcountField = reg.registerField("document.stats.object_count", FieldRegister::stringType, 1, 0);
     imagecountField = reg.registerField("document.stats.image_count", FieldRegister::stringType, 1, 0);
 }