Changeset 6874

Timestamp:

21/05/10 08:26:06 (9 years ago)

Author:

mnagni

Message:

Fixed a bug in SearchAgent? related to the TermTarget? original_format_name (the SQL string was not correct).
Fixed a possible NullPointer? (now even if the record details request is empty the application use the default values)
Version upgraded to 1.1.11

Location:

TI01-discovery-API/trunk/MEDINDiscoveryService

Files:

• pom.xml (modified) (3 diffs)
• src/main/java/ndg/services/discovery/medin/DiscoveryDictionary.java (modified) (1 diff)
• src/main/java/ndg/services/discovery/model/PresentAgent.java (modified) (1 diff)
• src/main/java/ndg/services/discovery/model/SearchAgent.java (modified) (2 diffs)

TI01-discovery-API/trunk/MEDINDiscoveryService/pom.xml

@@ -4 +4 @@
         <groupId>ndg.services.discovery</groupId>
         <artifactId>MedinDiscoveryService</artifactId>
-        <version>1.1.10</version>
+        <version>1.1.11</version>
         <packaging>aar</packaging>
 
@@ -14 +14 @@
 
         <dependencies>
-
-                <dependency>
-                        <groupId>commons-dbcp</groupId>
-                        <artifactId>commons-dbcp</artifactId>
-                        <version>1.2.2</version>
-                </dependency>
-
-                <!--
-                        <dependency> <groupId>postgresql</groupId>
-                        <artifactId>postgresql</artifactId> <version>8.3-603.jdbc4</version>
-                        </dependency>
-                -->
 
                 <dependency>
@@ -205 +193 @@
         <distributionManagement>
                 <snapshotRepository>
-                        <id>local.deploy</id>
+                        <id>juliet.badc.rl.ac.uk.local</id>
                         <name>local-releases</name>
                         <url>http://juliet.badc.rl.ac.uk:8180/artifactory/libs-releases-local</url>
                 </snapshotRepository>
                 <repository>
-                        <id>local.deploy</id>
+                        <id>juliet.badc.rl.ac.uk.local</id>
                         <name>local-releases</name>
                         <url>http://juliet.badc.rl.ac.uk:8180/artifactory/libs-releases-local</url>

TI01-discovery-API/trunk/MEDINDiscoveryService/src/main/java/ndg/services/discovery/medin/DiscoveryDictionary.java

@@ -48 +48 @@
         
         public static enum TermTarget {
-                FullText("document_ts_vector", "FullText"),
-                Author("authors_ts_vector", "Author"),
-                Parameters("parameters_ts_vector", "Parameters"),
-                ResourceType("resource_type_ts_vector", "ResourceType"),
-                TopicCategory("topic_category_ts_vector", "TopicCategory"),
-                Lineage("lineage_ts_vector", "Lineage"),
-                PublicAccessLimits("limitations_public_access_ts_vector", "PublicAccessLimits"),
-                DataOriginator("data_originator_tsvector", "DataOriginator"),
-                DataFormat("original_format_name", "DataFormat");               
-                
-                private final String fieldName;
-                private final String fieldLabel;
-                TermTarget(String fieldName, String fieldLabel) {
-                        this.fieldName = fieldName;
-                        this.fieldLabel = fieldLabel;
-                }
-                public final String fieldName() {
-                        return fieldName;
-                }
-                public final String fieldLabel() {
-                        return fieldLabel;
+                FullText("document_ts_vector", "FullText", true),
+                Author("authors_ts_vector", "Author", true),
+                Parameters("parameters_ts_vector", "Parameters", true),
+                ResourceType("resource_type_ts_vector", "ResourceType", true),
+                TopicCategory("topic_category_ts_vector", "TopicCategory", true),
+                Lineage("lineage_ts_vector", "Lineage", true),
+                PublicAccessLimits("limitations_public_access_ts_vector", "PublicAccessLimits", true),
+                DataOriginator("data_originator_tsvector", "DataOriginator", true),
+                DataFormat("original_format_name", "DataFormat", false);                
+                
+                private final String fieldName;
+                private final String fieldLabel;
+                private final boolean vector;
+                TermTarget(String fieldName, String fieldLabel, boolean vector) {
+                        this.fieldName = fieldName;
+                        this.fieldLabel = fieldLabel;
+                        this.vector = vector;
+                }
+                public final String fieldName() {
+                        return fieldName;
+                }
+                public final String fieldLabel() {
+                        return fieldLabel;
+                } 
+                public final boolean isVector() {
+                        return vector;
                 } 
         }       

TI01-discovery-API/trunk/MEDINDiscoveryService/src/main/java/ndg/services/discovery/model/PresentAgent.java

@@ -215 +215 @@
                 }
                 List<OriginalDocument> searchResult = executeSearch(conn, sqlQuery);
-                DiscoveryDictionary.RecordDetail detail = DiscoveryDictionary.getRecordDetails(type.getRecordDetail());
+                
+                DiscoveryDictionary.RecordDetail detail = DiscoveryDictionary.getRecordDetails(type == null ? null : type.getRecordDetail());
                 if (detail.equals(DiscoveryDictionary.RecordDetail.DocumentFull) || detail.equals(DiscoveryDictionary.RecordDetail.DocumentSummary)) {
                         fillSpatialTemporalData(conn, searchResult);                            

TI01-discovery-API/trunk/MEDINDiscoveryService/src/main/java/ndg/services/discovery/model/SearchAgent.java

@@ -298 +298 @@
                         }
 
-                        whereSQL.append(" query" + Integer.toString(queryIndex) + " @@ (");
-                        whereSQL.append(termTarget.fieldName());
-                        whereSQL.append(") ");
+                        whereSQL.append(" query" + Integer.toString(queryIndex) + " @@ ");
+                        whereSQL.append(composeVector(termTarget));
 
                         secondPass = true;
@@ -307 +306 @@
         }
 
+        private String composeVector(DiscoveryDictionary.TermTarget termTarget){
+                StringBuffer bf = new StringBuffer();
+                bf.append(termTarget.isVector() ? "" : "to_tsvector"); 
+                bf.append("(");
+                bf.append(termTarget.fieldName());
+                bf.append(")");
+                return bf.toString();
+        }
+        
         private void preapareTemporalSearch(StringBuffer fromSQL, StringBuffer whereSQL, TemporalType temporalType) {
                 if (temporalType == null || temporalType.getDateRange() == null