Author: kwright
Date: Wed Jun 25 15:17:49 2014
New Revision: 1605445
URL: http://svn.apache.org/r1605445
Log:
Add UI part, except for Javascript checking
Modified:
manifoldcf/branches/CONNECTORS-981/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
manifoldcf/branches/CONNECTORS-981/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties
Modified:
manifoldcf/branches/CONNECTORS-981/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-981/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java?rev=1605445&r1=1605444&r2=1605445&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-981/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
(original)
+++
manifoldcf/branches/CONNECTORS-981/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
Wed Jun 25 15:17:49 2014
@@ -1005,7 +1005,15 @@ public class SolrConnector extends org.a
String mimeTypeField =
parameters.getParameter(SolrConfig.PARAM_MIMETYPEFIELD);
if (mimeTypeField == null)
mimeTypeField = "";
-
+
+ String contentField =
parameters.getParameter(SolrConfig.PARAM_CONTENTFIELD);
+ if (contentField == null)
+ contentField = "";
+
+ String useExtractUpdate =
parameters.getParameter(SolrConfig.PARAM_EXTRACTUPDATE);
+ if (useExtractUpdate == null || useExtractUpdate.length() == 0)
+ useExtractUpdate = "true";
+
String realm = parameters.getParameter(SolrConfig.PARAM_REALM);
if (realm == null)
realm = "";
@@ -1460,6 +1468,31 @@ public class SolrConnector extends org.a
" <input name=\"mimetypefield\" type=\"text\" size=\"32\"
value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(mimeTypeField)+"\"/>\n"+
" </td>\n"+
" </tr>\n"+
+" <tr>\n"+
+" <td class=\"description\"><nobr>" +
Messages.getBodyString(locale,"SolrConnector.UseExtractUpdateHandler") +
"</nobr></td>\n"+
+" <td class=\"value\">\n"
+ );
+ if (!useExtractUpdate.equals("false"))
+ {
+ out.print(
+" <input name=\"extractupdate\" type=\"checkbox\" value=\"true\"
checked=\"true\"/>\n"
+ );
+ }
+ else
+ {
+ out.print(
+" <input name=\"extractupdate\" type=\"checkbox\" value=\"true\"/>\n"
+ );
+ }
+ out.print(
+" </td>\n"+
+" </tr>\n"+
+" <tr>\n"+
+" <td class=\"description\"><nobr>" +
Messages.getBodyString(locale,"SolrConnector.ContentFieldName") +
"</nobr></td>\n"+
+" <td class=\"value\">\n"+
+" <input name=\"contentfield\" type=\"text\" size=\"32\"
value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(contentField)+"\"/>\n"+
+" </td>\n"+
+" </tr>\n"+
"</table>\n"
);
}
@@ -1471,7 +1504,9 @@ public class SolrConnector extends org.a
"<input type=\"hidden\" name=\"createddatefield\"
value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(createdDateField)+"\"/>\n"+
"<input type=\"hidden\" name=\"indexeddatefield\"
value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(indexedDateField)+"\"/>\n"+
"<input type=\"hidden\" name=\"filenamefield\"
value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(fileNameField)+"\"/>\n"+
-"<input type=\"hidden\" name=\"mimetypefield\"
value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(mimeTypeField)+"\"/>\n"
+"<input type=\"hidden\" name=\"mimetypefield\"
value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(mimeTypeField)+"\"/>\n"+
+"<input type=\"hidden\" name=\"contentfield\"
value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(contentField)+"\"/>\n"+
+"<input type=\"hidden\" name=\"extractupdate\"
value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(useExtractUpdate)+"\"/>\n"
);
}
@@ -1771,6 +1806,14 @@ public class SolrConnector extends org.a
if (mimeTypeField != null)
parameters.setParameter(SolrConfig.PARAM_MIMETYPEFIELD,mimeTypeField);
+ String contentField = variableContext.getParameter("contentfield");
+ if (contentField != null)
+ parameters.setParameter(SolrConfig.PARAM_CONTENTFIELD,contentField);
+
+ String extractUpdate = variableContext.getParameter("extractupdate");
+ if (extractUpdate != null)
+ parameters.setParameter(SolrConfig.PARAM_EXTRACTUPDATE,extractUpdate);
+
String realm = variableContext.getParameter("realm");
if (realm != null)
parameters.setParameter(SolrConfig.PARAM_REALM,realm);
Modified:
manifoldcf/branches/CONNECTORS-981/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-981/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties?rev=1605445&r1=1605444&r2=1605445&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-981/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties
(original)
+++
manifoldcf/branches/CONNECTORS-981/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties
Wed Jun 25 15:17:49 2014
@@ -58,6 +58,7 @@ SolrConnector.CreatedDateFieldName=Creat
SolrConnector.IndexedDateFieldName=Indexed date field name:
SolrConnector.FileNameFieldName=File name field name:
SolrConnector.MimeTypeFieldName=Mime type field name:
+SolrConnector.ContentFieldName=Content field name:
SolrConnector.MaximumDocumentLength=Maximum document length:
SolrConnector.IncludedMimeTypes=Included mime types:
SolrConnector.ExcludedMimeTypes=Excluded mime types:
