lucene-solr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gsing...@apache.org
Subject svn commit: r815830 - in /lucene/solr/trunk/contrib/extraction/src: main/java/org/apache/solr/handler/extraction/ExtractingParams.java test/java/org/apache/solr/handler/ExtractingRequestHandlerTest.java
Date Wed, 16 Sep 2009 15:15:56 GMT
Author: gsingers
Date: Wed Sep 16 15:15:56 2009
New Revision: 815830

URL: http://svn.apache.org/viewvc?rev=815830&view=rev
Log:
SOLR-284 - map. -> fmap

Modified:
    lucene/solr/trunk/contrib/extraction/src/main/java/org/apache/solr/handler/extraction/ExtractingParams.java
    lucene/solr/trunk/contrib/extraction/src/test/java/org/apache/solr/handler/ExtractingRequestHandlerTest.java

Modified: lucene/solr/trunk/contrib/extraction/src/main/java/org/apache/solr/handler/extraction/ExtractingParams.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/extraction/src/main/java/org/apache/solr/handler/extraction/ExtractingParams.java?rev=815830&r1=815829&r2=815830&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/extraction/src/main/java/org/apache/solr/handler/extraction/ExtractingParams.java
(original)
+++ lucene/solr/trunk/contrib/extraction/src/main/java/org/apache/solr/handler/extraction/ExtractingParams.java
Wed Sep 16 15:15:56 2009
@@ -33,21 +33,21 @@
    * The param prefix for mapping Tika metadata to Solr fields.
    * <p/>
    * To map a field, add a name like:
-   * <pre>ext.map.title=solr.title</pre>
+   * <pre>fmap.title=solr.title</pre>
    *
    * In this example, the tika "title" metadata value will be added to a Solr field named
"solr.title"
    *
    *
    */
-  public static final String MAP_PREFIX = "map.";
+  public static final String MAP_PREFIX = "fmap.";
 
   /**
    * The boost value for the name of the field.  The boost can be specified by a name mapping.
    * <p/>
    * For example
    * <pre>
-   * ext.map.title=solr.title
-   * ext.boost.solr.title=2.5
+   * map.title=solr.title
+   * boost.solr.title=2.5
    * </pre>
    * will boost the solr.title field for this document by 2.5
    *
@@ -57,7 +57,7 @@
   /**
    * Pass in literal values to be added to the document, as in
    * <pre>
-   *  ext.literal.myField=Foo 
+   *  literal.myField=Foo 
    * </pre>
    *
    */
@@ -109,7 +109,7 @@
    *      Some more text
    *    &lt;/body&gt;
    * </pre>
-   * By passing in the p tag, you could capture all P tags separately from the rest of the
text.
+   * By passing in the p tag, you could capture all P tags separately from the rest of the
t
    * Thus, in the example, the capture of the P tag would be: "some text here.  more text"
    *
    */

Modified: lucene/solr/trunk/contrib/extraction/src/test/java/org/apache/solr/handler/ExtractingRequestHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/extraction/src/test/java/org/apache/solr/handler/ExtractingRequestHandlerTest.java?rev=815830&r1=815829&r2=815830&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/extraction/src/test/java/org/apache/solr/handler/ExtractingRequestHandlerTest.java
(original)
+++ lucene/solr/trunk/contrib/extraction/src/test/java/org/apache/solr/handler/ExtractingRequestHandlerTest.java
Wed Sep 16 15:15:56 2009
@@ -51,25 +51,25 @@
   public void testExtraction() throws Exception {
     ExtractingRequestHandler handler = (ExtractingRequestHandler) h.getCore().getRequestHandler("/update/extract");
     assertTrue("handler is null and it shouldn't be", handler != null);
-    loadLocal("solr-word.pdf", "map.created", "extractedDate", "map.producer", "extractedProducer",
-            "map.creator", "extractedCreator", "map.Keywords", "extractedKeywords",
-            "map.Author", "extractedAuthor",
-            "map.content", "extractedContent",
+    loadLocal("solr-word.pdf", "fmap.created", "extractedDate", "fmap.producer", "extractedProducer",
+            "fmap.creator", "extractedCreator", "fmap.Keywords", "extractedKeywords",
+            "fmap.Author", "extractedAuthor",
+            "fmap.content", "extractedContent",
            "literal.id", "one",
-            "map.Last-Modified", "extractedDate"
+            "fmap.Last-Modified", "extractedDate"
     );
     assertQ(req("title:solr-word"), "//*[@numFound='0']");
     assertU(commit());
     assertQ(req("title:solr-word"), "//*[@numFound='1']");
 
 
-    loadLocal("simple.html", "map.created", "extractedDate", "map.producer", "extractedProducer",
-            "map.creator", "extractedCreator", "map.Keywords", "extractedKeywords",
-            "map.Author", "extractedAuthor",
-            "map.language", "extractedLanguage",
+    loadLocal("simple.html", "fmap.created", "extractedDate", "fmap.producer", "extractedProducer",
+            "fmap.creator", "extractedCreator", "fmap.Keywords", "extractedKeywords",
+            "fmap.Author", "extractedAuthor",
+            "fmap.language", "extractedLanguage",
             "literal.id", "two",
-            "map.content", "extractedContent",
-            "map.Last-Modified", "extractedDate"
+            "fmap.content", "extractedContent",
+            "fmap.Last-Modified", "extractedDate"
     );
     assertQ(req("title:Welcome"), "//*[@numFound='0']");
     assertU(commit());
@@ -81,8 +81,8 @@
       "uprefix", "t_",
       "lowernames", "true",
       "captureAttr", "true",
-      "map.a","t_href",
-      "map.content_type", "abcxyz",  // test that lowernames is applied before mapping, and
uprefix is applied after mapping
+      "fmap.a","t_href",
+      "fmap.content_type", "abcxyz",  // test that lowernames is applied before mapping,
and uprefix is applied after mapping
       "commit", "true"  // test immediate commit
     );
 
@@ -99,7 +99,7 @@
       "literal.id","simple3",
       "uprefix", "t_",
       "lowernames", "true",
-      "captureAttr", "true",  "map.a","t_href",
+      "captureAttr", "true",  "fmap.a","t_href",
       "commit", "true"
 
       ,"boost.t_href", "100.0"
@@ -119,13 +119,13 @@
     assertQ(req("+id:simple4 +t_content:Solr"), "//*[@numFound='1']");
     assertQ(req("+id:simple4 +t_p:\"here is some text\""), "//*[@numFound='1']");
 
-    loadLocal("version_control.xml", "map.created", "extractedDate", "map.producer", "extractedProducer",
-            "map.creator", "extractedCreator", "map.Keywords", "extractedKeywords",
-            "map.Author", "extractedAuthor",
+    loadLocal("version_control.xml", "fmap.created", "extractedDate", "fmap.producer", "extractedProducer",
+            "fmap.creator", "extractedCreator", "fmap.Keywords", "extractedKeywords",
+            "fmap.Author", "extractedAuthor",
             "literal.id", "three",
-            "map.content", "extractedContent",
-            "map.language", "extractedLanguage",
-            "map.Last-Modified", "extractedDate"
+            "fmap.content", "extractedContent",
+            "fmap.language", "extractedLanguage",
+            "fmap.Last-Modified", "extractedDate"
     );
     assertQ(req("stream_name:version_control.xml"), "//*[@numFound='0']");
     assertU(commit());
@@ -142,7 +142,7 @@
       "literal.id","simple2",
       "lowernames", "true",
         "captureAttr", "true",
-        //"map.content_type", "abcxyz",
+        //"fmap.content_type", "abcxyz",
         "commit", "true"  // test immediate commit
       );
       assertTrue(false);
@@ -157,7 +157,7 @@
       ExtractingParams.DEFAULT_FIELD, "defaultExtr",//test that unmapped fields go to the
text field when no uprefix is specified
       "lowernames", "true",
       "captureAttr", "true",
-      //"map.content_type", "abcxyz",
+      //"fmap.content_type", "abcxyz",
       "commit", "true"  // test immediate commit
     );
     assertQ(req("id:simple2"), "//*[@numFound='1']");
@@ -170,8 +170,8 @@
             ExtractingParams.UNKNOWN_FIELD_PREFIX, "t_",
       "lowernames", "true",
       "captureAttr", "true",
-      "map.a","t_href",
-      //"map.content_type", "abcxyz",
+      "fmap.a","t_href",
+      //"fmap.content_type", "abcxyz",
       "commit", "true"  // test immediate commit
     );
     assertQ(req("+id:simple2 +t_href:[* TO *]"), "//*[@numFound='1']");
@@ -182,15 +182,15 @@
     ExtractingRequestHandler handler = (ExtractingRequestHandler) h.getCore().getRequestHandler("/update/extract");
     assertTrue("handler is null and it shouldn't be", handler != null);
     //test literal
-    loadLocal("version_control.xml", "map.created", "extractedDate", "map.producer", "extractedProducer",
-            "map.creator", "extractedCreator", "map.Keywords", "extractedKeywords",
-            "map.Author", "extractedAuthor",
-            "map.content", "extractedContent",
+    loadLocal("version_control.xml", "fmap.created", "extractedDate", "fmap.producer", "extractedProducer",
+            "fmap.creator", "extractedCreator", "fmap.Keywords", "extractedKeywords",
+            "fmap.Author", "extractedAuthor",
+            "fmap.content", "extractedContent",
             "literal.id", "one",
-            "map.language", "extractedLanguage",
+            "fmap.language", "extractedLanguage",
             "literal.extractionLiteralMV", "one",
             "literal.extractionLiteralMV", "two",
-            "map.Last-Modified", "extractedDate"
+            "fmap.Last-Modified", "extractedDate"
 
     );
     assertQ(req("stream_name:version_control.xml"), "//*[@numFound='0']");
@@ -201,15 +201,15 @@
     assertQ(req("extractionLiteralMV:two"), "//*[@numFound='1']");
 
     try {
-      loadLocal("version_control.xml", "map.created", "extractedDate", "map.producer", "extractedProducer",
-              "map.creator", "extractedCreator", "map.Keywords", "extractedKeywords",
-              "map.Author", "extractedAuthor",
-              "map.content", "extractedContent",
+      loadLocal("version_control.xml", "fmap.created", "extractedDate", "fmap.producer",
"extractedProducer",
+              "fmap.creator", "extractedCreator", "fmap.Keywords", "extractedKeywords",
+              "fmap.Author", "extractedAuthor",
+              "fmap.content", "extractedContent",
               "literal.id", "two",
-              "map.language", "extractedLanguage",
+              "fmap.language", "extractedLanguage",
               "literal.extractionLiteral", "one",
               "literal.extractionLiteral", "two",
-              "map.Last-Modified", "extractedDate"
+              "fmap.Last-Modified", "extractedDate"
       );
       // TODO: original author did not specify why an exception should be thrown... how to
fix?
       // assertTrue("Exception should have been thrown", false);
@@ -217,14 +217,14 @@
       //nothing to see here, move along
     }
 
-    loadLocal("version_control.xml", "map.created", "extractedDate", "map.producer", "extractedProducer",
-            "map.creator", "extractedCreator", "map.Keywords", "extractedKeywords",
-            "map.Author", "extractedAuthor",
-            "map.content", "extractedContent",
+    loadLocal("version_control.xml", "fmap.created", "extractedDate", "fmap.producer", "extractedProducer",
+            "fmap.creator", "extractedCreator", "fmap.Keywords", "extractedKeywords",
+            "fmap.Author", "extractedAuthor",
+            "fmap.content", "extractedContent",
             "literal.id", "three",
-            "map.language", "extractedLanguage",
+            "fmap.language", "extractedLanguage",
             "literal.extractionLiteral", "one",
-            "map.Last-Modified", "extractedDate"
+            "fmap.Last-Modified", "extractedDate"
     );
     assertU(commit());
     assertQ(req("extractionLiteral:one"), "//*[@numFound='1']");
@@ -237,12 +237,12 @@
     assertTrue("handler is null and it shouldn't be", handler != null);
 
     // Load plain text specifying MIME type:
-    loadLocal("version_control.txt", "map.created", "extractedDate", "map.producer", "extractedProducer",
-            "map.creator", "extractedCreator", "map.Keywords", "extractedKeywords",
-            "map.Author", "extractedAuthor",
+    loadLocal("version_control.txt", "fmap.created", "extractedDate", "fmap.producer", "extractedProducer",
+            "fmap.creator", "extractedCreator", "fmap.Keywords", "extractedKeywords",
+            "fmap.Author", "extractedAuthor",
             "literal.id", "one",
-            "map.language", "extractedLanguage",
-            "map.content", "extractedContent",
+            "fmap.language", "extractedLanguage",
+            "fmap.content", "extractedContent",
             ExtractingParams.STREAM_TYPE, "text/plain"
     );
     assertQ(req("extractedContent:Apache"), "//*[@numFound='0']");
@@ -255,12 +255,12 @@
     assertTrue("handler is null and it shouldn't be", handler != null);
 
     // Load plain text specifying filename
-    loadLocal("version_control.txt", "map.created", "extractedDate", "map.producer", "extractedProducer",
-            "map.creator", "extractedCreator", "map.Keywords", "extractedKeywords",
-            "map.Author", "extractedAuthor",
+    loadLocal("version_control.txt", "fmap.created", "extractedDate", "fmap.producer", "extractedProducer",
+            "fmap.creator", "extractedCreator", "fmap.Keywords", "extractedKeywords",
+            "fmap.Author", "extractedAuthor",
             "literal.id", "one",
-            "map.language", "extractedLanguage",
-            "map.content", "extractedContent",
+            "fmap.language", "extractedLanguage",
+            "fmap.content", "extractedContent",
             ExtractingParams.RESOURCE_NAME, "version_control.txt"
     );
     assertQ(req("extractedContent:Apache"), "//*[@numFound='0']");



Mime
View raw message