minor clean up of SruServiceWrapper

diff --git a/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/sru/SruServiceWrapper.java b/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/sru/SruServiceWrapper.java
index 4bc2ab07cd41b253c988dc51dbe8d0221cdb7ea5..b7e49978176adfb7da605ba266adc2ee87681606 100644 (file)
--- a/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/sru/SruServiceWrapper.java
+++ b/cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/sru/SruServiceWrapper.java
@@ -34,13 +34,14 @@ import eu.etaxonomy.cdm.model.reference.ReferenceBase;
  */\r
 public class SruServiceWrapper extends ServiceWrapperBase<ReferenceBase> {\r
        \r
-       //http://gso.gbv.de/sru/DB=2.1/?version=1.1&operation=searchRetrieve&query=pica.tit%3D%22harry+potter%22&recordSchema=pica\r
-       \r
        private String SruVersion = "1.1";\r
        \r
-       \r
-       \r
-       public List<ReferenceBase> doSearchRetrieve(String query, String recordSchema){\r
+       /**\r
+        * @param cqlQuery an <b>URL encoded</b> CQL Query string see {@link http://www.loc.gov/standards/sru/specs/cql.html} for documentation\r
+        * @param recordSchema\r
+        * @return\r
+        */\r
+       public List<ReferenceBase> doSearchRetrieve(String cqlQuery, String recordSchema){\r
                \r
                List<NameValuePair> pairs = new ArrayList<NameValuePair>();\r
                \r
@@ -49,11 +50,11 @@ public class SruServiceWrapper extends ServiceWrapperBase<ReferenceBase> {
                        logger.error("No SchemaAdapter found for " + recordSchema);\r
                }\r
                \r
-               String SruOperation = "searchRetrieve";\r
+               String sruOperation = "searchRetrieve";\r
                \r
-               pairs.add(new BasicNameValuePair("operation", SruOperation));\r
+               pairs.add(new BasicNameValuePair("operation", sruOperation));\r
                pairs.add(new BasicNameValuePair("version", SruVersion));\r
-               pairs.add(new BasicNameValuePair("query", query));\r
+               pairs.add(new BasicNameValuePair("query", cqlQuery));\r
                pairs.add(new BasicNameValuePair("recordSchema", recordSchema));\r
                \r
                Map<String, String> requestHeaders = new HashMap<String, String>();\r

diff --git a/cdmlib-ext/src/test/java/eu/etaxonomy/cdm/ext/sru/SruServiceWrapperTest.java b/cdmlib-ext/src/test/java/eu/etaxonomy/cdm/ext/sru/SruServiceWrapperTest.java
index 5b283f44e232cc77bd4266ee0e462e17df4227cc..f613821d45dac6e3666823a43d3b78392d659a37 100644 (file)
--- a/cdmlib-ext/src/test/java/eu/etaxonomy/cdm/ext/sru/SruServiceWrapperTest.java
+++ b/cdmlib-ext/src/test/java/eu/etaxonomy/cdm/ext/sru/SruServiceWrapperTest.java
@@ -40,7 +40,7 @@ public class SruServiceWrapperTest {
        @Test\r
        public void testDoSearchRetrieve(){\r
                \r
-               List<ReferenceBase> refList = sruServiceWrapper.doSearchRetrieve("Linnaei Species Plantarum Europae", "dc");\r
+               List<ReferenceBase> refList = sruServiceWrapper.doSearchRetrieve("pica.tit=\"Linnaei Species Plantarum Europae\"", "dc");\r
                // -> http://gso.gbv.de/sru/DB=2.1/?version=1.1&operation=searchRetrieve&query=pica.tit%3D%22Species+Plantarum%22&recordSchema=dc\r
                        \r
                Assert.assertEquals("There should be exactly 2 result for 'Linnaei Species Plantarum Europae'", 2, refList.size());\r