Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating to/deleting from remote Solr on newer Tomcats. #4

Closed
wants to merge 8 commits into from
+97 −131
Closed

Updating to/deleting from remote Solr on newer Tomcats. #4

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5a2e24d
Fix build paths in Eclipse project.
adam-vessey Jan 24, 2017
e97a5b2
Escape messages for XML stuff.
adam-vessey Jan 24, 2017
60e72b7
To spaces, for consistency.
adam-vessey Jan 24, 2017
55d41fc
Adjust headers.
adam-vessey Feb 10, 2017
45b21fe
More exception context.
adam-vessey Feb 10, 2017
b83fd97
Add use of URI class for validation, and escape the necessary charact…
adam-vessey Feb 10, 2017
5b80e75
Doc comment on the overloading.
adam-vessey Feb 13, 2017
df7c22a
Merge pull request #1 from adam-vessey/new-tomcat
willtp87 Feb 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
109 changes: 55 additions & 54 deletions .classpath
View file
Original file line number Diff line number Diff line change
@@ -6,59 +6,60 @@
<classpathentry kind="src" path="FgsLucene/src/java"/>
<classpathentry kind="src" path="FgsSolr2/src/java"/>
<classpathentry kind="src" path="FgsZebra/src/java"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/activation-1.1.1.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/commons-codec-1.3.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/commons-httpclient-3.1.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/commons-logging.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/dom4j-1.6.1.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/jaxen-1.1.1.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/jaxrpc-api-1.1.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/jrdf-0.3.4.3.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/jsr173_1.0_api.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/junit-4.5.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/log4j-1.2.15.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/saaj-api-1.3.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/saxon9he.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/serializer.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/wsdl4j-1.5.1.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/xalan.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/jcl-over-slf4j-1.5.10.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/jul-to-slf4j-1.5.10.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/log4j-over-slf4j-1.5.10.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/logback-core-0.9.18.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/slf4j-api-1.5.10.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/abdera-core-1.1.2.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/abdera-extensions-main-1.1.2.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/abdera-i18n-1.1.2.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/abdera-parser-1.1.2.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/axiom-api-1.2.10.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/axiom-impl-1.2.10.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/commons-discovery-0.2.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/trippi-core-1.5.4.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/activemq-all-5.5.0.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/mail-1.4.1.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/sjsxp-1.0.1.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/xml-apis-1.3.04.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/xmlunit-1.3.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/servlet-api-2.4.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/xercesImpl-2.9.1.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/axis-1.4.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/fedora-client-messaging-0.6.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/fcrepo-common-3.5.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/fcrepo-client-admin-3.5-fedora.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/fcrepo-server-3.5.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/tika-app-1.4.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/fontbox-1.8.4.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/jempbox-1.8.4.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/lucene-analyzers-common-4.6.1.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/lucene-benchmark-4.6.1.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/lucene-core-4.6.1.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/lucene-demo-4.6.1.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/lucene-highlighter-4.6.1.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/lucene-memory-4.6.1.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/lucene-queries-4.6.1.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/lucene-queryparser-4.6.1.jar"/>
<classpathentry kind="lib" path="FedoraGenericSearch/lib/pdfbox-1.8.4.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/activation-1.1.1.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/commons-codec-1.3.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/commons-httpclient-3.1.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/commons-logging.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/dom4j-1.6.1.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/jaxen-1.1.1.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/jaxrpc-api-1.1.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/jrdf-0.3.4.3.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/jsr173_1.0_api.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/junit-4.5.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/log4j-1.2.15.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/saaj-api-1.3.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/saxon9he.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/serializer.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/wsdl4j-1.5.1.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/xalan.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/jcl-over-slf4j-1.5.10.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/jul-to-slf4j-1.5.10.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/log4j-over-slf4j-1.5.10.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/logback-core-0.9.18.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/slf4j-api-1.5.10.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/abdera-core-1.1.2.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/abdera-extensions-main-1.1.2.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/abdera-i18n-1.1.2.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/abdera-parser-1.1.2.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/axiom-api-1.2.10.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/axiom-impl-1.2.10.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/commons-discovery-0.2.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/trippi-core-1.5.4.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/activemq-all-5.5.0.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/mail-1.4.1.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/sjsxp-1.0.1.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/xml-apis-1.3.04.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/xmlunit-1.3.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/servlet-api-2.4.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/xercesImpl-2.9.1.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/axis-1.4.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/fedora-client-messaging-0.6.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/fcrepo-common-3.5.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/fcrepo-client-admin-3.5-fedora.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/fcrepo-server-3.5.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/tika-app-1.4.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/fontbox-1.8.4.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/jempbox-1.8.4.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/lucene-analyzers-common-4.6.1.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/lucene-benchmark-4.6.1.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/lucene-core-4.6.1.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/lucene-demo-4.6.1.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/lucene-highlighter-4.6.1.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/lucene-memory-4.6.1.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/lucene-queries-4.6.1.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/lucene-queryparser-4.6.1.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/pdfbox-1.8.4.jar"/>
<classpathentry exported="true" kind="lib" path="FedoraGenericSearch/lib/commons-lang3-3.5.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
/FgsBuild
/bin/
/.DS_Store
44 changes: 1 addition & 43 deletions FedoraGenericSearch/.classpath
View file
Original file line number Diff line number Diff line change
@@ -2,49 +2,7 @@
<classpath>
<classpathentry kind="src" path="src/java"/>
<classpathentry kind="src" path="src/test/junit"/>
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/gsearch"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="lib/axis.jar"/>
<classpathentry kind="lib" path="lib/commons-codec-1.3.jar"/>
<classpathentry kind="lib" path="lib/commons-discovery.jar"/>
<classpathentry kind="lib" path="lib/commons-logging.jar"/>
<classpathentry kind="lib" path="lib/mail.jar"/>
<classpathentry kind="lib" path="lib/serializer.jar"/>
<classpathentry kind="lib" path="lib/servlet-api.jar"/>
<classpathentry kind="lib" path="lib/trippi-1.1.1-core.jar"/>
<classpathentry kind="lib" path="lib/wsdl4j-1.5.1.jar"/>
<classpathentry kind="lib" path="lib/xalan.jar"/>
<classpathentry kind="lib" path="lib/xercesImpl.jar"/>
<classpathentry kind="lib" path="lib/xml-apis.jar"/>
<classpathentry kind="lib" path="lib/abdera-core-0.4.0-incubating.jar"/>
<classpathentry kind="lib" path="lib/abdera-parser-0.4.0-incubating.jar"/>
<classpathentry kind="lib" path="lib/axiom-api-1.2.5.jar"/>
<classpathentry kind="lib" path="lib/axiom-impl-1.2.5.jar"/>
<classpathentry kind="lib" path="lib/jsr173_1.0_api.jar"/>
<classpathentry kind="lib" path="lib/sjsxp.jar"/>
<classpathentry kind="lib" path="lib/activemq-all-5.1.0.jar"/>
<classpathentry kind="lib" path="lib/abdera-i18n-0.4.0-incubating.jar"/>
<classpathentry kind="lib" path="lib/activation-1.1.1.jar"/>
<classpathentry kind="lib" path="lib/commons-httpclient-3.1.jar"/>
<classpathentry kind="lib" path="lib/dom4j-1.6.1.jar"/>
<classpathentry kind="lib" path="lib/jaxen-1.1.1.jar"/>
<classpathentry kind="lib" path="lib/jaxrpc-api-1.1.jar"/>
<classpathentry kind="lib" path="lib/jrdf-0.3.4.3.jar"/>
<classpathentry kind="lib" path="lib/junit-4.5.jar"/>
<classpathentry kind="lib" path="lib/log4j-1.2.15.jar"/>
<classpathentry kind="lib" path="lib/saaj-api-1.3.jar"/>
<classpathentry kind="lib" path="lib/xmlunit-1.2.jar"/>
<classpathentry kind="lib" path="lib/pdfbox-1.6.0.jar"/>
<classpathentry kind="lib" path="lib/fedora-messaging-client-3.1r7812.jar"/>
<classpathentry kind="lib" path="lib/fedora-client-3.1.jar"/>
<classpathentry kind="lib" path="lib/fontbox-1.6.0.jar"/>
<classpathentry kind="lib" path="lib/jempbox-1.6.0.jar"/>
<classpathentry kind="lib" path="lib/fedora-server.jar"/>
<classpathentry kind="lib" path="lib/saxon9he.jar"/>
<classpathentry kind="lib" path="lib/lucene-analyzers-3.4.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-benchmark-3.4.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-core-3.4.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-demo-3.4.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-highlighter-3.4.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-memory-3.4.0.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
1 change: 1 addition & 0 deletions FedoraGenericSearch/.gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/dist
/dist
/bin
/.DS_Store
Binary file added FedoraGenericSearch/lib/commons-lang3-3.5.jar
View file
Binary file not shown.
10 changes: 1 addition & 9 deletions FgsLucene/.classpath
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="src" path="/FedoraGenericSearch"/>
<classpathentry kind="lib" path="/FedoraGenericSearch/lib/fedora-client-3.1.jar"/>
<classpathentry kind="lib" path="/FedoraGenericSearch/lib/log4j-1.2.15.jar"/>
<classpathentry kind="lib" path="/FedoraGenericSearch/lib/lucene-analyzers-3.4.0.jar"/>
<classpathentry kind="lib" path="/FedoraGenericSearch/lib/lucene-benchmark-3.4.0.jar"/>
<classpathentry kind="lib" path="/FedoraGenericSearch/lib/lucene-core-3.4.0.jar"/>
<classpathentry kind="lib" path="/FedoraGenericSearch/lib/lucene-demo-3.4.0.jar"/>
<classpathentry kind="lib" path="/FedoraGenericSearch/lib/lucene-highlighter-3.4.0.jar"/>
<classpathentry kind="lib" path="/FedoraGenericSearch/lib/lucene-memory-3.4.0.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
8 changes: 0 additions & 8 deletions FgsSolrRemote/.classpath
View file
Original file line number Diff line number Diff line change
@@ -3,13 +3,5 @@
<classpathentry kind="src" path="src/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/FedoraGenericSearch"/>
<classpathentry kind="lib" path="/FedoraGenericSearch/lib/fedora-client-3.1.jar"/>
<classpathentry kind="lib" path="/FedoraGenericSearch/lib/log4j-1.2.15.jar"/>
<classpathentry kind="lib" path="/FedoraGenericSearch/lib/lucene-analyzers-3.4.0.jar"/>
<classpathentry kind="lib" path="/FedoraGenericSearch/lib/lucene-benchmark-3.4.0.jar"/>
<classpathentry kind="lib" path="/FedoraGenericSearch/lib/lucene-core-3.4.0.jar"/>
<classpathentry kind="lib" path="/FedoraGenericSearch/lib/lucene-demo-3.4.0.jar"/>
<classpathentry kind="lib" path="/FedoraGenericSearch/lib/lucene-highlighter-3.4.0.jar"/>
<classpathentry kind="lib" path="/FedoraGenericSearch/lib/lucene-memory-3.4.0.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
54 changes: 37 additions & 17 deletions FgsSolrRemote/src/java/dk/defxws/fgssolrremote/OperationsImpl.java
View file
Original file line number Diff line number Diff line change
@@ -20,6 +20,7 @@
import java.io.StringReader;
import java.io.Writer;
import java.net.HttpURLConnection;
import java.net.URI;
import java.net.URL;
import java.rmi.RemoteException;
import java.util.StringTokenizer;
@@ -32,6 +33,8 @@
import dk.defxws.fedoragsearch.server.GenericOperationsImpl;
import dk.defxws.fedoragsearch.server.errors.GenericSearchException;

import static org.apache.commons.lang3.StringEscapeUtils.escapeXml11;

/**
* performs the SolrRemote specific parts of the operations
*
@@ -102,9 +105,9 @@ public String updateIndex(
emptyTotal = 0;
StringBuffer resultXml = new StringBuffer();
try {
resultXml = sendToSolr("/select?q=*%3A*&rows=0", null);
resultXml = sendToSolr("/select?q=*%3A*&rows=0");
} catch (Exception e) {
throw new GenericSearchException("updateIndex sendToSolr:\n"+e);
throw new GenericSearchException("updateIndex sendToSolr:\n"+e, e);
}
int i = resultXml.indexOf("numFound=");
int j = resultXml.indexOf("\"", i+10);
@@ -197,7 +200,7 @@ private void deletePid(
try {
sendToSolr("/update", sb.toString());
} catch (Exception e) {
throw new GenericSearchException("updateIndex deletePid sendToSolr\n"+e);
throw new GenericSearchException("updateIndex deletePid sendToSolr\n"+e, e);
}
if (existed) {
deleteTotal++;
@@ -212,9 +215,9 @@ protected boolean indexDocExists(String pid)
boolean indexDocExists = true;
StringBuffer resultXml = new StringBuffer();
try {
resultXml = sendToSolr("/select?q=PID%3A\""+pid+"\"&rows=0", null);
resultXml = sendToSolr("/select?q=PID%3A%22"+pid+"%22&rows=0");
} catch (Exception e) {
throw new GenericSearchException("updateIndex sendToSolr:\n"+e);
throw new GenericSearchException("updateIndex sendToSolr:\n"+e, e);
}
int i = resultXml.indexOf("numFound=");
int j = resultXml.indexOf("\"", i+10);
@@ -270,13 +273,15 @@ private void indexDocs(
else
{
try {
indexDoc(getPidFromObjectFilename(file.getName()), repositoryName, indexName, new FileInputStream(file), resultXml, indexDocXslt);
} catch (RemoteException e) {
resultXml.append("<warning no=\""+(++warnCount)+"\">file="+file.getAbsolutePath()+" exception="+e.toString()+"</warning>\n");
logger.warn("<warning no=\""+(warnCount)+"\">file="+file.getAbsolutePath()+" exception="+e.toString()+"</warning>");
} catch (FileNotFoundException e) {
resultXml.append("<warning no=\""+(++warnCount)+"\">file="+file.getAbsolutePath()+" exception="+e.toString()+"</warning>\n");
logger.warn("<warning no=\""+(warnCount)+"\">file="+file.getAbsolutePath()+" exception="+e.toString()+"</warning>");
indexDoc(getPidFromObjectFilename(file.getName()), repositoryName, indexName, new FileInputStream(file),
resultXml, indexDocXslt);
} catch (RemoteException | FileNotFoundException e) {
String message = String.format("<warning no=\"%d\">file=%s exception=%s</warning>",
++warnCount,
escapeXml11(file.getAbsolutePath()),
escapeXml11(e.toString()));
resultXml.append(message);
logger.warn(message);
}
}
}
@@ -353,7 +358,7 @@ private void indexDoc(
try {
sendToSolr("/update", sb.toString());
} catch (Exception e) {
throw new GenericSearchException("updateIndex sendToSolr:\n"+e);
throw new GenericSearchException("updateIndex sendToSolr:\n"+e, e);
}
if (indexDocExists(pid)) {
updateTotal++;
@@ -371,17 +376,32 @@ private void indexDoc(
emptyTotal++;
}
}

/**
* Send GET request.
*
* Overloading helper for default parameter.
*
* @param solrCommand
* @return
* @throws Exception
*/
private StringBuffer sendToSolr(String solrCommand) throws Exception {
return sendToSolr(solrCommand, null);
}

private StringBuffer sendToSolr(String solrCommand, String postParameters) throws Exception {
if (logger.isDebugEnabled())
logger.debug("sendToSolr solrCommand="+solrCommand+"\nPost parameters=\n" + postParameters);
String base = config.getIndexBase(indexName);
URL url = new URL(base+solrCommand);
URI uri = new URI(base+solrCommand);
URL url = uri.toURL();
HttpURLConnection con = (HttpURLConnection) url.openConnection();
con.setRequestProperty("Content-type", "text/xml; charset=UTF-8");

if (postParameters != null) {
con.setRequestMethod("POST");
con.setDoOutput(true);
con.setRequestProperty("Content-type", "text/xml; charset=UTF-8");
con.setRequestMethod("POST");
con.setDoOutput(true);
OutputStream out = con.getOutputStream();
Writer writer = new OutputStreamWriter(out, "UTF-8");
Reader reader = new StringReader(postParameters);