[phylr commit] r29 - no log message
codesite...@google.com
Date: Wed Jun 24 19:05:02 2009
New Revision: 29
Added:
trunk/phylr-gsoc/src/main/java/org/nescent/phylr/lucene/DCRecordResolver.java
- copied, changed from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/Lucene/DCRecordResolver.java
trunk/phylr-gsoc/src/main/java/org/nescent/phylr/lucene/NexmlRecordResolver.java
- copied, changed from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/Lucene/NexmlRecordResolver.java
trunk/phylr-gsoc/src/main/java/org/oclc/
trunk/phylr-gsoc/src/main/java/org/oclc/os/
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/DataPair.java
- copied, changed from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/DataPair.java
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/DbEntry.java
- copied, changed from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/DbEntry.java
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/ElementParser.java
- copied, changed from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/ElementParser.java
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/EmbeddedSRWDatabase.java
- copied, changed from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/EmbeddedSRWDatabase.java
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/HouseKeeping.java
- copied, changed from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/HouseKeeping.java
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/HttpHeaderSetter.java
- copied, changed from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/HttpHeaderSetter.java
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/LateContentParsingHttpServletRequestWrapper.java
- copied, changed from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/LateContentParsingHttpServletRequestWrapper.java
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/Lucene/
- copied from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/Lucene/
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/MessageElementBugDemo.java
- copied, changed from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/MessageElementBugDemo.java
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/NameValuePair.java
- copied, changed from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/NameValuePair.java
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/QueryResult.java
- copied, changed from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/QueryResult.java
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/QueryTranslator.java
- copied, changed from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/QueryTranslator.java
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/Record.java
- copied, changed from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/Record.java
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/RecordIterator.java
- copied, changed from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/RecordIterator.java
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/SRUServerTester.java
- copied, changed from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/SRUServerTester.java
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/SRUServerTesterServlet.java
- copied, changed from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/SRUServerTesterServlet.java
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/SRUTimer.java
- copied, changed from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/SRUTimer.java
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/SRWClient.java
- copied, changed from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/SRWClient.java
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/SRWDatabase.java
- copied, changed from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/SRWDatabase.java
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/SRWDatabasePool.java
- copied, changed from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/SRWDatabasePool.java
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/SRWDiagnostic.java
- copied, changed from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/SRWDiagnostic.java
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/SRWDiagnosticsHolder.java
- copied, changed from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/SRWDiagnosticsHolder.java
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/SRWGuiClient.java
- copied, changed from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/SRWGuiClient.java
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/SRWJaxrDatabase.java.later
- copied unchanged from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/SRWJaxrDatabase.java.later
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/SRWServlet.java
- copied, changed from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/SRWServlet.java
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/SRWServletInfo.java
- copied, changed from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/SRWServletInfo.java
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/SRWTestDatabase.java
- copied, changed from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/SRWTestDatabase.java
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/SRWZ3950Database.java.later
- copied unchanged from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/SRWZ3950Database.java.later
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/SortElementExtractor.java
- copied, changed from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/SortElementExtractor.java
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/SortElementExtractorException.java
- copied, changed from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/SortElementExtractorException.java
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/SortEntry.java
- copied, changed from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/SortEntry.java
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/SortTool.java
- copied, changed from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/SortTool.java
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/TermList.java
- copied, changed from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/TermList.java
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/TermTypeIterator.java
- copied, changed from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/TermTypeIterator.java
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/TestQueryResult.java
- copied, changed from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/TestQueryResult.java
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/TestRecordIterator.java
- copied, changed from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/TestRecordIterator.java
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/TestTermList.java
- copied, changed from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/TestTermList.java
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/TransformingExtractor.java
- copied, changed from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/TransformingExtractor.java
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/Utilities.java
- copied, changed from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/Utilities.java
trunk/phylr-gsoc/src/test/java/org/nexml/model/
Removed:
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/Lucene/DCRecordResolver.java
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/Lucene/NexmlRecordResolver.java
Modified:
trunk/phylr-gsoc/src/main/java/gov/loc/www/zing/srw/srw_bindings/ExplainSoapBindingImpl.java
trunk/phylr-gsoc/src/main/java/gov/loc/www/zing/srw/srw_bindings/SRWSoapBindingImpl.java
trunk/phylr-gsoc/src/main/java/org/nescent/phylr/lucene/NexmlIndexer.java
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/Lucene/BasicLuceneQueryTranslator.java
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/Lucene/BasicLuceneRecordResolver.java
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/Lucene/CqlQueryTranslator.java
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/Lucene/LuceneQueryResult.java
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/Lucene/LuceneRecordIterator.java
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/Lucene/RecordResolver.java
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/Lucene/SRWLuceneDatabase.java
trunk/phylr-gsoc/src/main/resources/TreeIndex.props
trunk/phylr-gsoc/src/test/resources/predicates.txt
Log:
Modified:
trunk/phylr-gsoc/src/main/java/gov/loc/www/zing/srw/srw_bindings/ExplainSoapBindingImpl.java
==============================================================================
---
trunk/phylr-gsoc/src/main/java/gov/loc/www/zing/srw/srw_bindings/ExplainSoapBindingImpl.java
(original)
+++
trunk/phylr-gsoc/src/main/java/gov/loc/www/zing/srw/srw_bindings/ExplainSoapBindingImpl.java
Wed Jun 24 19:05:02 2009
@@ -17,7 +17,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.axis.message.MessageElement;
-import ORG.oclc.os.SRW.SRWDatabase;
+import org.oclc.os.SRW.SRWDatabase;
import org.w3c.dom.Document;
import org.xml.sax.InputSource;
Modified:
trunk/phylr-gsoc/src/main/java/gov/loc/www/zing/srw/srw_bindings/SRWSoapBindingImpl.java
==============================================================================
---
trunk/phylr-gsoc/src/main/java/gov/loc/www/zing/srw/srw_bindings/SRWSoapBindingImpl.java
(original)
+++
trunk/phylr-gsoc/src/main/java/gov/loc/www/zing/srw/srw_bindings/SRWSoapBindingImpl.java
Wed Jun 24 19:05:02 2009
@@ -16,7 +16,6 @@
package gov.loc.www.zing.srw.srw_bindings;
-import ORG.oclc.os.SRW.Utilities;
import gov.loc.www.zing.cql.xcql.BooleanType;
import gov.loc.www.zing.cql.xcql.OperandType;
import gov.loc.www.zing.cql.xcql.RelationType;
@@ -33,8 +32,6 @@
import java.net.URL;
import java.rmi.RemoteException;
-import ORG.oclc.os.SRW.SRWDatabase;
-import ORG.oclc.os.SRW.SRWDiagnostic;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Hashtable;
@@ -42,6 +39,9 @@
import org.apache.axis.types.NonNegativeInteger;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.oclc.os.SRW.SRWDatabase;
+import org.oclc.os.SRW.SRWDiagnostic;
+import org.oclc.os.SRW.Utilities;
import org.z3950.zing.cql.CQLAndNode;
import org.z3950.zing.cql.CQLBooleanNode;
import org.z3950.zing.cql.CQLNode;
Copied:
trunk/phylr-gsoc/src/main/java/org/nescent/phylr/lucene/DCRecordResolver.java
(from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/Lucene/DCRecordResolver.java)
==============================================================================
---
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/Lucene/DCRecordResolver.java
(original)
+++
trunk/phylr-gsoc/src/main/java/org/nescent/phylr/lucene/DCRecordResolver.java
Wed Jun 24 19:05:02 2009
@@ -1,14 +1,17 @@
-package ORG.oclc.os.SRW.Lucene;
+package org.nescent.phylr.lucene;
import gov.loc.www.zing.srw.ExtraDataType;
+import java.util.List;
import java.util.Properties;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.oclc.os.SRW.Record;
+import org.oclc.os.SRW.Lucene.RecordResolver;
-import ORG.oclc.os.SRW.Record;
public class DCRecordResolver implements RecordResolver {
static Log log=LogFactory.getLog(DCRecordResolver.class);
@@ -22,10 +25,19 @@
public Record resolve(Document doc, String IdFieldName,
ExtraDataType extraDataType) {
StringBuffer sb = new StringBuffer("<dc
xmlns:dc=\"http://purl.org/dc/elements/1.1/\">");
-
- sb.append("<dc:creator>");
- sb.append(doc.getField("authors").stringValue());
- sb.append("</dc:creator>");
+ List fields = doc.getFields();
+ for (Object object : fields) {
+ Field field = (Field)object;
+ if (field.name().startsWith("dc.")) {
+ sb.append("<");
+ sb.append(field.name().replace('.', ':'));
+ sb.append(">");
+ sb.append(field.stringValue());
+ sb.append("</");
+ sb.append(field.name().replace('.', ':'));
+ sb.append(">");
+ }
+ }
sb.append("</dc>");
return new Record(sb.toString(), SCHEMA_ID);
}
Modified:
trunk/phylr-gsoc/src/main/java/org/nescent/phylr/lucene/NexmlIndexer.java
==============================================================================
---
trunk/phylr-gsoc/src/main/java/org/nescent/phylr/lucene/NexmlIndexer.java
(original)
+++
trunk/phylr-gsoc/src/main/java/org/nescent/phylr/lucene/NexmlIndexer.java
Wed Jun 24 19:05:02 2009
@@ -20,6 +20,12 @@
import javax.xml.xpath.XPathExpressionException;
import javax.xml.xpath.XPathFactory;
+import org.apache.commons.cli.BasicParser;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.LineIterator;
import org.apache.commons.lang.StringUtils;
@@ -34,9 +40,89 @@
public class NexmlIndexer {
private Map<Predicate, XPathExpression> xpaths;
+ private static final String USAGE = "java
org.nescent.phylr.lucene.NexmlIndexer [-h] -d <data_dir> -i <index_dir> -m
<predicates_mapping_file>";
+
+ private static final String HEADER = "NEXML Lucene Indexer";
+
+ private static final String FOOTER = "For more instructions, please visit
http://tinyurl.com/q2pchz";
+
+ private static void printUsageAndExit(Options options) {
+ HelpFormatter helpFormatter = new HelpFormatter();
+ helpFormatter.defaultWidth = 80;
+ helpFormatter.printHelp(USAGE, HEADER, options, FOOTER);
+ System.exit(0);
+ }
+
+ @SuppressWarnings("static-access")
+ public static Options setupOptions() {
+ Options options = new Options();
+ options.addOption("m", "mappings", true, "Mappings for CQL predicates to
XPaths");
+ options.addOption("i", "index", true, "The lucene index directory");
+ options.addOption("h", "help", false, "Optional. print usage
information");
+ options.addOption("d", "data", true, "Directory where NEXML files to be
found");
+ return options;
+ }
+
+ public static void main(String[] args) {
+ Options options = setupOptions();
+ CommandLineParser cmdParser = new BasicParser();
+
+ String index = null;
+ String data = null;
+ String mappings = null;
+
+ try {
+ CommandLine cmd = cmdParser.parse(options, args);
+
+ if (cmd.hasOption('h')) {
+ printUsageAndExit(options);
+ }
+
+ mappings = cmd.getOptionValue('m');
+ index = cmd.getOptionValue('i');
+ data = cmd.getOptionValue('d');
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+
+ if (StringUtils.isBlank(mappings) || StringUtils.isBlank(index) ||
StringUtils.isBlank(data)) {
+ printUsageAndExit(options);
+ }
+
+ File mappingsFile = new File(mappings);
+ if (!mappingsFile.isFile()) {
+ System.out.println("Can't open " + mappings);
+ printUsageAndExit(options);
+ }
+
+ File indexDir = new File(index);
+ File dataDir = new File(data);
+ if (!indexDir.isDirectory()) {
+ System.out.println("Can't open " + indexDir);
+ printUsageAndExit(options);
+ }
+
+ if (!dataDir.isDirectory()) {
+ System.out.println("Can't open " + dataDir);
+ printUsageAndExit(options);
+ }
+
+ List<Predicate> list;
+ try {
+ list = NexmlIndexer.readPredicates(new FileReader(mappingsFile));
+ NexmlIndexer indexer = new NexmlIndexer(list);
+ indexer.index(dataDir, indexDir);
+ } catch (FileNotFoundException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ }
public NexmlIndexer(List<Predicate> fields) {
- //System.setProperty("javax.xml.xpath.XPathFactory:"+
NamespaceConstant.OBJECT_MODEL_SAXON, "net.sf.saxon.xpath.XPathFactoryImpl");
XPathFactory factory = XPathFactory.newInstance();
XPath xpath = factory.newXPath();
xpath.setNamespaceContext(new NexmlNamespaceContext());
@@ -184,7 +270,7 @@
try {
DocumentBuilderFactory domFactory = DocumentBuilderFactory
.newInstance();
- domFactory.setNamespaceAware(true); // never forget this!
+ //domFactory.setNamespaceAware(true);
DocumentBuilder builder = domFactory.newDocumentBuilder();
doc = builder.parse(file);
} catch (Exception e) {
Copied:
trunk/phylr-gsoc/src/main/java/org/nescent/phylr/lucene/NexmlRecordResolver.java
(from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/Lucene/NexmlRecordResolver.java)
==============================================================================
---
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/Lucene/NexmlRecordResolver.java
(original)
+++
trunk/phylr-gsoc/src/main/java/org/nescent/phylr/lucene/NexmlRecordResolver.java
Wed Jun 24 19:05:02 2009
@@ -1,4 +1,4 @@
-package ORG.oclc.os.SRW.Lucene;
+package org.nescent.phylr.lucene;
import gov.loc.www.zing.srw.ExtraDataType;
@@ -7,8 +7,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.lucene.document.Document;
+import org.oclc.os.SRW.Record;
+import org.oclc.os.SRW.Lucene.RecordResolver;
-import ORG.oclc.os.SRW.Record;
public class NexmlRecordResolver implements RecordResolver {
static Log log=LogFactory.getLog(DCRecordResolver.class);
Copied: trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/DataPair.java (from
r22, /trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/DataPair.java)
==============================================================================
--- /trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/DataPair.java (original)
+++ trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/DataPair.java Wed Jun 24
19:05:02 2009
@@ -19,7 +19,7 @@
* Created on June 9, 2005, 9:59 AM
*/
-package ORG.oclc.os.SRW;
+package org.oclc.os.SRW;
/**
*
Copied: trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/DbEntry.java (from
r22, /trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/DbEntry.java)
==============================================================================
--- /trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/DbEntry.java (original)
+++ trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/DbEntry.java Wed Jun 24
19:05:02 2009
@@ -19,7 +19,7 @@
* Created on May 20, 2005, 11:08 AM
*/
-package ORG.oclc.os.SRW;
+package org.oclc.os.SRW;
/**
*
Copied: trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/ElementParser.java
(from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/ElementParser.java)
==============================================================================
--- /trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/ElementParser.java
(original)
+++ trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/ElementParser.java Wed
Jun 24 19:05:02 2009
@@ -19,7 +19,7 @@
* Created on October 28, 2005, 9:35 AM
*/
-package ORG.oclc.os.SRW;
+package org.oclc.os.SRW;
import java.util.Enumeration;
import java.util.NoSuchElementException;
Copied:
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/EmbeddedSRWDatabase.java
(from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/EmbeddedSRWDatabase.java)
==============================================================================
---
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/EmbeddedSRWDatabase.java
(original)
+++ trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/EmbeddedSRWDatabase.java
Wed Jun 24 19:05:02 2009
@@ -19,7 +19,7 @@
* Created on November 19, 2002, 1:53 PM
*/
-package ORG.oclc.os.SRW;
+package org.oclc.os.SRW;
import gov.loc.www.zing.srw.diagnostic.DiagnosticType;
import gov.loc.www.zing.srw.DiagnosticsType;
Copied: trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/HouseKeeping.java
(from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/HouseKeeping.java)
==============================================================================
--- /trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/HouseKeeping.java
(original)
+++ trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/HouseKeeping.java Wed
Jun 24 19:05:02 2009
@@ -19,7 +19,7 @@
* Created on November 2, 2004, 2:19 PM
*/
-package ORG.oclc.os.SRW;
+package org.oclc.os.SRW;
import java.util.Enumeration;
import java.util.Hashtable;
Copied:
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/HttpHeaderSetter.java (from
r22, /trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/HttpHeaderSetter.java)
==============================================================================
--- /trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/HttpHeaderSetter.java
(original)
+++ trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/HttpHeaderSetter.java
Wed Jun 24 19:05:02 2009
@@ -1,4 +1,4 @@
-package ORG.oclc.os.SRW;
+package org.oclc.os.SRW;
import gov.loc.www.zing.srw.SearchRetrieveRequestType;
import gov.loc.www.zing.srw.SearchRetrieveResponseType;
Copied:
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/LateContentParsingHttpServletRequestWrapper.java
(from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/LateContentParsingHttpServletRequestWrapper.java)
==============================================================================
---
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/LateContentParsingHttpServletRequestWrapper.java
(original)
+++
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/LateContentParsingHttpServletRequestWrapper.java
Wed Jun 24 19:05:02 2009
@@ -3,7 +3,7 @@
Expression licensePrefix is undefined on line 5, column 3 in
Templates/Licenses/license-default.txt.and open the template in the editor.
*/
-package ORG.oclc.os.SRW;
+package org.oclc.os.SRW;
import java.util.Enumeration;
import java.util.Hashtable;
Modified:
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/Lucene/BasicLuceneQueryTranslator.java
==============================================================================
---
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/Lucene/BasicLuceneQueryTranslator.java
(original)
+++
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/Lucene/BasicLuceneQueryTranslator.java
Wed Jun 24 19:05:02 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ORG.oclc.os.SRW.Lucene;
+package org.oclc.os.SRW.Lucene;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.PerFieldAnalyzerWrapper;
@@ -26,10 +26,10 @@
import org.apache.lucene.search.*;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.oclc.os.SRW.SRWDiagnostic;
import org.z3950.zing.cql.*;
import java.util.*;
-import ORG.oclc.os.SRW.SRWDiagnostic;
/**
* @author peter
Modified:
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/Lucene/BasicLuceneRecordResolver.java
==============================================================================
---
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/Lucene/BasicLuceneRecordResolver.java
(original)
+++
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/Lucene/BasicLuceneRecordResolver.java
Wed Jun 24 19:05:02 2009
@@ -19,10 +19,8 @@
* Created on November 1, 2006, 1:40 PM
*/
-package ORG.oclc.os.SRW.Lucene;
+package org.oclc.os.SRW.Lucene;
-import ORG.oclc.os.SRW.Record;
-import ORG.oclc.os.SRW.Utilities;
import gov.loc.www.zing.srw.ExtraDataType;
import java.util.Iterator;
import java.util.Properties;
@@ -30,6 +28,8 @@
import org.apache.lucene.document.Field;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.oclc.os.SRW.Record;
+import org.oclc.os.SRW.Utilities;
/**
Modified:
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/Lucene/CqlQueryTranslator.java
==============================================================================
---
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/Lucene/CqlQueryTranslator.java
(original)
+++
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/Lucene/CqlQueryTranslator.java
Wed Jun 24 19:05:02 2009
@@ -7,12 +7,12 @@
* and open the template in the editor.
*/
-package ORG.oclc.os.SRW.Lucene;
+package org.oclc.os.SRW.Lucene;
-import ORG.oclc.os.SRW.SRWDiagnostic;
import java.util.Properties;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.Query;
+import org.oclc.os.SRW.SRWDiagnostic;
import org.z3950.zing.cql.CQLNode;
/**
Modified:
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/Lucene/LuceneQueryResult.java
==============================================================================
---
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/Lucene/LuceneQueryResult.java
(original)
+++
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/Lucene/LuceneQueryResult.java
Wed Jun 24 19:05:02 2009
@@ -19,14 +19,14 @@
* Created on October 20, 2006, 2:58 PM
*/
-package ORG.oclc.os.SRW.Lucene;
+package org.oclc.os.SRW.Lucene;
-import ORG.oclc.os.SRW.QueryResult;
-import ORG.oclc.os.SRW.RecordIterator;
import gov.loc.www.zing.srw.ExtraDataType;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.lucene.search.Hits;
+import org.oclc.os.SRW.QueryResult;
+import org.oclc.os.SRW.RecordIterator;
/**
Modified:
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/Lucene/LuceneRecordIterator.java
==============================================================================
---
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/Lucene/LuceneRecordIterator.java
(original)
+++
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/Lucene/LuceneRecordIterator.java
Wed Jun 24 19:05:02 2009
@@ -19,16 +19,16 @@
* Created on October 20, 2006, 3:03 PM
*/
-package ORG.oclc.os.SRW.Lucene;
+package org.oclc.os.SRW.Lucene;
-import ORG.oclc.os.SRW.Record;
-import ORG.oclc.os.SRW.RecordIterator;
import gov.loc.www.zing.srw.ExtraDataType;
import java.util.NoSuchElementException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.lucene.document.Document;
import org.apache.lucene.search.Hits;
+import org.oclc.os.SRW.Record;
+import org.oclc.os.SRW.RecordIterator;
/**
*
Modified:
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/Lucene/RecordResolver.java
==============================================================================
---
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/Lucene/RecordResolver.java
(original)
+++
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/Lucene/RecordResolver.java
Wed Jun 24 19:05:02 2009
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package ORG.oclc.os.SRW.Lucene;
+package org.oclc.os.SRW.Lucene;
import gov.loc.www.zing.srw.ExtraDataType;
import java.util.Properties;
-import ORG.oclc.os.SRW.Record;
import org.apache.lucene.document.Document;
+import org.oclc.os.SRW.Record;
/**
* Interface for resolving records and schemas.
Modified:
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/Lucene/SRWLuceneDatabase.java
==============================================================================
---
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/Lucene/SRWLuceneDatabase.java
(original)
+++
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/Lucene/SRWLuceneDatabase.java
Wed Jun 24 19:05:02 2009
@@ -19,14 +19,8 @@
* Created on August 4, 2003, 1:54 PM
*/
-package ORG.oclc.os.SRW.Lucene;
+package org.oclc.os.SRW.Lucene;
-import ORG.oclc.os.SRW.QueryResult;
-import ORG.oclc.os.SRW.Record;
-import ORG.oclc.os.SRW.SRWDatabase;
-import ORG.oclc.os.SRW.SRWDiagnostic;
-import ORG.oclc.os.SRW.SortTool;
-import ORG.oclc.os.SRW.TermList;
import gov.loc.www.zing.srw.ExtraDataType;
import gov.loc.www.zing.srw.ScanRequestType;
import gov.loc.www.zing.srw.SearchRetrieveRequestType;
@@ -53,6 +47,12 @@
import org.apache.lucene.search.Sort;
import org.apache.lucene.search.SortField;
//import org.osuosl.srw.ResolvingQueryResult;
+import org.oclc.os.SRW.QueryResult;
+import org.oclc.os.SRW.Record;
+import org.oclc.os.SRW.SRWDatabase;
+import org.oclc.os.SRW.SRWDiagnostic;
+import org.oclc.os.SRW.SortTool;
+import org.oclc.os.SRW.TermList;
import org.z3950.zing.cql.CQLNode;
import org.z3950.zing.cql.CQLTermNode;
Copied:
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/MessageElementBugDemo.java
(from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/MessageElementBugDemo.java)
==============================================================================
---
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/MessageElementBugDemo.java
(original)
+++
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/MessageElementBugDemo.java
Wed Jun 24 19:05:02 2009
@@ -3,7 +3,7 @@
* and open the template in the editor.
*/
-package ORG.oclc.os.SRW;
+package org.oclc.os.SRW;
import java.io.StringReader;
import javax.xml.parsers.DocumentBuilder;
Copied: trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/NameValuePair.java
(from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/NameValuePair.java)
==============================================================================
--- /trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/NameValuePair.java
(original)
+++ trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/NameValuePair.java Wed
Jun 24 19:05:02 2009
@@ -19,7 +19,7 @@
* Created on October 28, 2005, 9:59 AM
*/
-package ORG.oclc.os.SRW;
+package org.oclc.os.SRW;
/**
*
Copied: trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/QueryResult.java
(from r22, /trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/QueryResult.java)
==============================================================================
--- /trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/QueryResult.java
(original)
+++ trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/QueryResult.java Wed Jun
24 19:05:02 2009
@@ -19,7 +19,7 @@
* Created on October 28, 2005, 11:01 AM
*/
-package ORG.oclc.os.SRW;
+package org.oclc.os.SRW;
import gov.loc.www.zing.srw.ExtraDataType;
import java.util.Hashtable;
Copied: trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/QueryTranslator.java
(from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/QueryTranslator.java)
==============================================================================
--- /trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/QueryTranslator.java
(original)
+++ trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/QueryTranslator.java Wed
Jun 24 19:05:02 2009
@@ -7,7 +7,7 @@
* and open the template in the editor.
*/
-package ORG.oclc.os.SRW;
+package org.oclc.os.SRW;
import gov.loc.www.zing.srw.ExtraDataType;
import java.util.Properties;
Copied: trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/Record.java (from
r22, /trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/Record.java)
==============================================================================
--- /trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/Record.java (original)
+++ trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/Record.java Wed Jun 24
19:05:02 2009
@@ -19,7 +19,7 @@
* Created on November 1, 2005, 8:39 AM
*/
-package ORG.oclc.os.SRW;
+package org.oclc.os.SRW;
/**
*
Copied: trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/RecordIterator.java
(from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/RecordIterator.java)
==============================================================================
--- /trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/RecordIterator.java
(original)
+++ trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/RecordIterator.java Wed
Jun 24 19:05:02 2009
@@ -19,7 +19,7 @@
* Created on November 1, 2005, 8:40 AM
*/
-package ORG.oclc.os.SRW;
+package org.oclc.os.SRW;
import java.util.Iterator;
Copied: trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/SRUServerTester.java
(from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/SRUServerTester.java)
==============================================================================
--- /trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/SRUServerTester.java
(original)
+++ trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/SRUServerTester.java Wed
Jun 24 19:05:02 2009
@@ -19,7 +19,7 @@
* Created on November 1, 2005, 8:40 AM
*/
-package ORG.oclc.os.SRW;
+package org.oclc.os.SRW;
import gov.loc.www.zing.srw.interfaces.ExplainPort;
import gov.loc.www.zing.srw.interfaces.SRWPort;
Copied:
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/SRUServerTesterServlet.java
(from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/SRUServerTesterServlet.java)
==============================================================================
---
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/SRUServerTesterServlet.java
(original)
+++
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/SRUServerTesterServlet.java
Wed Jun 24 19:05:02 2009
@@ -19,7 +19,7 @@
* Created on September 15, 2005, 11:28 AM
*/
-package ORG.oclc.os.SRW;
+package org.oclc.os.SRW;
import java.io.*;
import java.net.*;
Copied: trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/SRUTimer.java (from
r22, /trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/SRUTimer.java)
==============================================================================
--- /trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/SRUTimer.java (original)
+++ trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/SRUTimer.java Wed Jun 24
19:05:02 2009
@@ -19,7 +19,7 @@
* Created on November 19, 2004, 1:53 PM
*/
-package ORG.oclc.os.SRW;
+package org.oclc.os.SRW;
import java.io.BufferedReader;
import java.io.InputStreamReader;
Copied: trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/SRWClient.java (from
r22, /trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/SRWClient.java)
==============================================================================
--- /trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/SRWClient.java
(original)
+++ trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/SRWClient.java Wed Jun
24 19:05:02 2009
@@ -19,7 +19,7 @@
* Created on November 19, 2002, 1:53 PM
*/
-package ORG.oclc.os.SRW;
+package org.oclc.os.SRW;
import gov.loc.www.zing.srw.interfaces.ExplainPort;
import gov.loc.www.zing.srw.interfaces.SRWPort;
Copied: trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/SRWDatabase.java
(from r22, /trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/SRWDatabase.java)
==============================================================================
--- /trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/SRWDatabase.java
(original)
+++ trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/SRWDatabase.java Wed Jun
24 19:05:02 2009
@@ -19,7 +19,7 @@
* Created on August 4, 2003, 1:49 PM
*/
-package ORG.oclc.os.SRW;
+package org.oclc.os.SRW;
import gov.loc.www.zing.srw.ExtraDataType;
import gov.loc.www.zing.srw.RecordType;
Copied: trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/SRWDatabasePool.java
(from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/SRWDatabasePool.java)
==============================================================================
--- /trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/SRWDatabasePool.java
(original)
+++ trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/SRWDatabasePool.java Wed
Jun 24 19:05:02 2009
@@ -19,7 +19,7 @@
* Created on August 2, 2005, 3:55 PM
*/
-package ORG.oclc.os.SRW;
+package org.oclc.os.SRW;
import gov.loc.www.zing.srw.ScanRequestType;
import gov.loc.www.zing.srw.ScanResponseType;
import gov.loc.www.zing.srw.SearchRetrieveRequestType;
Copied: trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/SRWDiagnostic.java
(from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/SRWDiagnostic.java)
==============================================================================
--- /trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/SRWDiagnostic.java
(original)
+++ trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/SRWDiagnostic.java Wed
Jun 24 19:05:02 2009
@@ -19,7 +19,7 @@
* Created on January 16, 2004, 10:11 AM
*/
-package ORG.oclc.os.SRW;
+package org.oclc.os.SRW;
import gov.loc.www.zing.srw.DiagnosticsType;
import gov.loc.www.zing.srw.diagnostic.DiagnosticType;
Copied:
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/SRWDiagnosticsHolder.java
(from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/SRWDiagnosticsHolder.java)
==============================================================================
---
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/SRWDiagnosticsHolder.java
(original)
+++
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/SRWDiagnosticsHolder.java
Wed Jun 24 19:05:02 2009
@@ -19,7 +19,7 @@
* Created on October 20, 2006, 11:01 AM
*/
-package ORG.oclc.os.SRW;
+package org.oclc.os.SRW;
import gov.loc.www.zing.srw.DiagnosticsType;
import gov.loc.www.zing.srw.diagnostic.DiagnosticType;
Copied: trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/SRWGuiClient.java
(from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/SRWGuiClient.java)
==============================================================================
--- /trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/SRWGuiClient.java
(original)
+++ trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/SRWGuiClient.java Wed
Jun 24 19:05:02 2009
@@ -19,7 +19,7 @@
* Created on November 19, 2002, 1:53 PM
*/
-package ORG.oclc.os.SRW;
+package org.oclc.os.SRW;
import gov.loc.www.zing.srw.interfaces.ExplainPort;
import gov.loc.www.zing.srw.interfaces.SRWPort;
Copied: trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/SRWServlet.java
(from r22, /trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/SRWServlet.java)
==============================================================================
--- /trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/SRWServlet.java
(original)
+++ trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/SRWServlet.java Wed Jun
24 19:05:02 2009
@@ -22,7 +22,7 @@
limitations under the License.
*/
-package ORG.oclc.os.SRW;
+package org.oclc.os.SRW;
import org.apache.axis.transport.http.AxisHttpSession;
import org.apache.axis.transport.http.AxisServlet;
Copied: trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/SRWServletInfo.java
(from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/SRWServletInfo.java)
==============================================================================
--- /trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/SRWServletInfo.java
(original)
+++ trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/SRWServletInfo.java Wed
Jun 24 19:05:02 2009
@@ -19,7 +19,7 @@
* Created on December 5, 2002, 2:19 PM
*/
-package ORG.oclc.os.SRW;
+package org.oclc.os.SRW;
import java.io.File;
import java.io.FileNotFoundException;
Copied: trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/SRWTestDatabase.java
(from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/SRWTestDatabase.java)
==============================================================================
--- /trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/SRWTestDatabase.java
(original)
+++ trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/SRWTestDatabase.java Wed
Jun 24 19:05:02 2009
@@ -19,7 +19,7 @@
* Created on August 5, 2003, 4:17 PM
*/
-package ORG.oclc.os.SRW;
+package org.oclc.os.SRW;
import gov.loc.www.zing.srw.ScanRequestType;
import gov.loc.www.zing.srw.SearchRetrieveRequestType;
Copied:
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/SortElementExtractor.java
(from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/SortElementExtractor.java)
==============================================================================
---
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/SortElementExtractor.java
(original)
+++
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/SortElementExtractor.java
Wed Jun 24 19:05:02 2009
@@ -19,7 +19,7 @@
* Created on October 17, 2005, 3:47 PM
*/
-package ORG.oclc.os.SRW;
+package org.oclc.os.SRW;
/**
*
Copied:
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/SortElementExtractorException.java
(from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/SortElementExtractorException.java)
==============================================================================
---
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/SortElementExtractorException.java
(original)
+++
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/SortElementExtractorException.java
Wed Jun 24 19:05:02 2009
@@ -19,7 +19,7 @@
* Created on October 17, 2005, 4:06 PM
*/
-package ORG.oclc.os.SRW;
+package org.oclc.os.SRW;
/**
*
Copied: trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/SortEntry.java (from
r22, /trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/SortEntry.java)
==============================================================================
--- /trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/SortEntry.java
(original)
+++ trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/SortEntry.java Wed Jun
24 19:05:02 2009
@@ -19,7 +19,7 @@
* Created on August 3, 2004, 9:13 PM
*/
-package ORG.oclc.os.SRW;
+package org.oclc.os.SRW;
/**
*
Copied: trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/SortTool.java (from
r22, /trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/SortTool.java)
==============================================================================
--- /trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/SortTool.java (original)
+++ trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/SortTool.java Wed Jun 24
19:05:02 2009
@@ -19,7 +19,7 @@
* Created on August 3, 2004, 2:17 PM
*/
-package ORG.oclc.os.SRW;
+package org.oclc.os.SRW;
import java.util.StringTokenizer;
import org.apache.commons.logging.Log;
Copied: trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/TermList.java (from
r22, /trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/TermList.java)
==============================================================================
--- /trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/TermList.java (original)
+++ trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/TermList.java Wed Jun 24
19:05:02 2009
@@ -7,7 +7,7 @@
* and open the template in the editor.
*/
-package ORG.oclc.os.SRW;
+package org.oclc.os.SRW;
import gov.loc.www.zing.srw.TermType;
Copied:
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/TermTypeIterator.java (from
r22, /trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/TermTypeIterator.java)
==============================================================================
--- /trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/TermTypeIterator.java
(original)
+++ trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/TermTypeIterator.java
Wed Jun 24 19:05:02 2009
@@ -18,7 +18,7 @@
limitations under the License.
*/
-package ORG.oclc.os.SRW;
+package org.oclc.os.SRW;
import gov.loc.www.zing.srw.ScanResponseType;
import gov.loc.www.zing.srw.TermType;
Copied: trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/TestQueryResult.java
(from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/TestQueryResult.java)
==============================================================================
--- /trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/TestQueryResult.java
(original)
+++ trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/TestQueryResult.java Wed
Jun 24 19:05:02 2009
@@ -19,7 +19,7 @@
* Created on October 28, 2005, 11:01 AM
*/
-package ORG.oclc.os.SRW;
+package org.oclc.os.SRW;
import gov.loc.www.zing.srw.ExtraDataType;
Copied:
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/TestRecordIterator.java
(from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/TestRecordIterator.java)
==============================================================================
--- /trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/TestRecordIterator.java
(original)
+++ trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/TestRecordIterator.java
Wed Jun 24 19:05:02 2009
@@ -19,7 +19,7 @@
* Created on November 1, 2005, 2:29 PM
*/
-package ORG.oclc.os.SRW;
+package org.oclc.os.SRW;
import java.io.UnsupportedEncodingException;
import java.util.NoSuchElementException;
Copied: trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/TestTermList.java
(from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/TestTermList.java)
==============================================================================
--- /trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/TestTermList.java
(original)
+++ trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/TestTermList.java Wed
Jun 24 19:05:02 2009
@@ -19,7 +19,7 @@
* Created on October 20, 2006, 10:42 AM
*/
-package ORG.oclc.os.SRW;
+package org.oclc.os.SRW;
import gov.loc.www.zing.srw.TermType;
import org.apache.axis.types.PositiveInteger;
Copied:
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/TransformingExtractor.java
(from r22,
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/TransformingExtractor.java)
==============================================================================
---
/trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/TransformingExtractor.java
(original)
+++
trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/TransformingExtractor.java
Wed Jun 24 19:05:02 2009
@@ -19,7 +19,7 @@
* Created on October 17, 2005, 3:55 PM
*/
-package ORG.oclc.os.SRW;
+package org.oclc.os.SRW;
/**
*
Copied: trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/Utilities.java (from
r22, /trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/Utilities.java)
==============================================================================
--- /trunk/phylr-gsoc/src/main/java/ORG/oclc/os/SRW/Utilities.java
(original)
+++ trunk/phylr-gsoc/src/main/java/org/oclc/os/SRW/Utilities.java Wed Jun
24 19:05:02 2009
@@ -19,7 +19,7 @@
* Created on October 17, 2005, 3:13 PM
*/
-package ORG.oclc.os.SRW;
+package org.oclc.os.SRW;
import com.Ostermiller.util.CGIParser;
import gov.loc.www.zing.srw.ScanRequestType;
Modified: trunk/phylr-gsoc/src/main/resources/TreeIndex.props
==============================================================================
--- trunk/phylr-gsoc/src/main/resources/TreeIndex.props (original)
+++ trunk/phylr-gsoc/src/main/resources/TreeIndex.props Wed Jun 24 19:05:02
2009
@@ -40,11 +40,11 @@
nexml.location=http://www.nexml.org/1.0/nexml.xsd
nexml.namespace=http://www.nexml.org/1.0
nexml.title=Nexml
-nexml.resolver=ORG.oclc.os.SRW.Lucene.NexmlRecordResolver
+nexml.resolver=org.nescent.phylr.lucene.NexmlRecordResolver
dc.identifier=info:srw/schema/1/dc-v1.1
dc.location=http://www.loc.gov/standards/sru/resources/dc-schema.xsd
dc.namespace=http://purl.org/dc/elements/1.1/
dc.title=Dublin Core
-dc.resolver=ORG.oclc.os.SRW.Lucene.DCRecordResolver
+dc.resolver=org.nescent.phylr.lucene.DCRecordResolver
Modified: trunk/phylr-gsoc/src/test/resources/predicates.txt
==============================================================================
--- trunk/phylr-gsoc/src/test/resources/predicates.txt (original)
+++ trunk/phylr-gsoc/src/test/resources/predicates.txt Wed Jun 24 19:05:02
2009
@@ -1,32 +1,32 @@
-dc.description String //nex:meta[@property='dc:description']/@content Any
object Dublin core A descriptive string, e.g. the matrix description field
-dc.identifier String //nex:meta[@property='dc:identifier']/@content Any
object Dublin core A binomial identifier, e.g. TreeBASE2:Tr3242, NCBI:1232,
uBio:23423
-dc.title String /nex:nexml/meta[@property='dc:title']/@content Study
Dublin core The title of a study
-dc.creator String /nex:nexml/nex:meta[@property='dc:creator']/@content
Study Dublin core The submitter of a study
-dc.contributor String
/nex:nexml/nex:meta[@property='dc:contributor']/@content Citation Dublin
core An author of a study
-dc.abstract String /nex:nexml/nex:meta[@property='dc:abstract']/@content
Citation Dublin core A study abstract
-prism.publicationName String
/nex:nexml/nex:meta[@property='prism:publicationName']/@content Citation
Prism context set The publication in which study was published (e.g. a
journal name)
-prism.doi String /nex:nexml/nex:meta[@property='prism:doi']/@content
Citation Prism context set The digital object identifier of the publication
-prism.volume Int /nex:nexml/nex:meta[@property='prism:volume']/@content
Citation Prism context set The volume number of the publication
-prism.number Int /nex:nexml/nex:meta[@property='prism:number']/@content
Citation Prism context set The issue number of the publication
-prism.startingPage Int
/nex:nexml/nex:meta[@property='prism:startingPage']/@content Citation Prism
context set The starting page number of the publication
-prism.endingPage Int
/nex:nexml/nex:meta[@property='prism:endingPage']/@content Citation Prism
context set The ending page number of the publication
-prism.pageRange String
/nex:nexml/nex:meta[@property='prism:pageRange']/@content Citation Prism
context set The page range of the publication (maybe instead of start/end)
-prism.creationDate Date
/nex:nexml/nex:meta[@property='prism:creationDate']/@content Citation Prism
context set The date the submission was created
-prism.publicationDate Date
/nex:nexml/nex:meta[@property='prism:publicationDate']/@content Citation
Prism context set The date the study was published
-prism.embargoDate Date
/nex:nexml/nex:meta[@property='prism:embargoDate']/@content Citation Prism
context set The date a study was made public on TreeBASE
-prism.keyword String
/nex:nexml/nex:meta[@property='prism:keyword']/@content Citation Prism
context set A single keyword
-tb.taxonLabel String //nex:otu/@label Taxon TreeBASE The human-readable
label/name of a Taxon
+dc.description String //meta[@property='dc:description']/@content Any
object Dublin core A descriptive string, e.g. the matrix description field
+dc.identifier String //meta[@property='dc:identifier']/@content Any object
Dublin core A binomial identifier, e.g. TreeBASE2:Tr3242, NCBI:1232,
uBio:23423
+dc.title String /nexml/meta[@property='dc:title']/@content Study Dublin
core The title of a study
+dc.creator String /nexml/meta[@property='dc:creator']/@content Study
Dublin core The submitter of a study
+dc.contributor String /nexml/meta[@property='dc:contributor']/@content
Citation Dublin core An author of a study
+dc.abstract String /nexml/meta[@property='dc:abstract']/@content Citation
Dublin core A study abstract
+prism.publicationName String
/nexml/meta[@property='prism:publicationName']/@content Citation Prism
context set The publication in which study was published (e.g. a journal
name)
+prism.doi String /nexml/meta[@property='prism:doi']/@content Citation
Prism context set The digital object identifier of the publication
+prism.volume Int /nexml/meta[@property='prism:volume']/@content Citation
Prism context set The volume number of the publication
+prism.number Int /nexml/meta[@property='prism:number']/@content Citation
Prism context set The issue number of the publication
+prism.startingPage Int
/nexml/meta[@property='prism:startingPage']/@content Citation Prism context
set The starting page number of the publication
+prism.endingPage Int /nexml/meta[@property='prism:endingPage']/@content
Citation Prism context set The ending page number of the publication
+prism.pageRange String /nexml/meta[@property='prism:pageRange']/@content
Citation Prism context set The page range of the publication (maybe instead
of start/end)
+prism.creationDate Date
/nexml/meta[@property='prism:creationDate']/@content Citation Prism context
set The date the submission was created
+prism.publicationDate Date
/nexml/meta[@property='prism:publicationDate']/@content Citation Prism
context set The date the study was published
+prism.embargoDate Date /nexml/meta[@property='prism:embargoDate']/@content
Citation Prism context set The date a study was made public on TreeBASE
+prism.keyword String /nexml/meta[@property='prism:keyword']/@content
Citation Prism context set A single keyword
+tb.taxonLabel String //otu/@label Taxon TreeBASE The human-readable
label/name of a Taxon
tb.taxon String ??? Taxon TreeBASE A shorthand, e.g.
tb.taxon='taxonID:3123' or tb.taxon='taxonLabel:Homo%20Sapiens'
-tb.taxaLabel String //nex:otus/@label Taxa TreeBASE The human-readable
label/name of a TaxaBlock
-tb.matrixLabel String //nex:characters/@label Matrix TreeBASE The
human-readable label/name of a character state matrix
-tb.matrixDatatype String //nex:characters/@xsi:type Matrix TreeBASE The
data type, e.g. DNA, RNA, Protein, Continuous, Standard, etc. Maybe make
this an enumeration
-tb.matrixNTAX Int count(//nex:characters//nex:row) Matrix TreeBASE The
number of rows in a matrix
-tb.matrixNCHAR Int count(//nex:characters//nex:char) Matrix TreeBASE The
number of columns in a matrix
+tb.taxaLabel String //otus/@label Taxa TreeBASE The human-readable
label/name of a TaxaBlock
+tb.matrixLabel String //characters/@label Matrix TreeBASE The
human-readable label/name of a character state matrix
+tb.matrixDatatype String //characters/@xsi:type Matrix TreeBASE The data
type, e.g. DNA, RNA, Protein, Continuous, Standard, etc. Maybe make this an
enumeration
+tb.matrixNTAX Int count(//characters//row) Matrix TreeBASE The number of
rows in a matrix
+tb.matrixNCHAR Int count(//characters//char) Matrix TreeBASE The number of
columns in a matrix
tb.matrixTaxon *tb.taxon ?? Matrix TreeBASE A taxon query on the taxa
associated with the tree
-tb.treeBlockLabel String //nex:trees/@label TreeBlock TreeBASE The
human-readable label/name of a TreeBlock
-tb.treeLabel String //nex:tree/@label Tree TreeBASE The human-readable
label/name of a Tree
-tb.treeType String //nex:tree/nex:meta[@property='tb.treeType']/@content
Tree TreeBASE The tree type, "Single" or "Consensus"
-tb.treeKind String //nex:tree/nex:meta[@property='tb.treeKind']/@content
Tree TreeBASE The tree kind, "Species" or "Gene"
-tb.treeQuality String
//nex:tree/nex:meta[@property='tb.treeQuality']/@content Tree TreeBASE Tree
quality, e.g. "Unrated"
-tb.treeNTAX Int count(//nex:tree/node[@otu]) Tree TreeBASE The number of
taxa in a tree
+tb.treeBlockLabel String //trees/@label TreeBlock TreeBASE The
human-readable label/name of a TreeBlock
+tb.treeLabel String //tree/@label Tree TreeBASE The human-readable
label/name of a Tree
+tb.treeType String //tree/meta[@property='tb.treeType']/@content Tree
TreeBASE The tree type, "Single" or "Consensus"
+tb.treeKind String //tree/meta[@property='tb.treeKind']/@content Tree
TreeBASE The tree kind, "Species" or "Gene"
+tb.treeQuality String //tree/meta[@property='tb.treeQuality']/@content
Tree TreeBASE Tree quality, e.g. "Unrated"
+tb.treeNTAX Int count(//tree/node[@otu]) Tree TreeBASE The number of taxa
in a tree
tb.treeTaxon *tb.taxon ??? Tree TreeBASE A taxon query on the taxa
associated with the tree