Changeset 8911

Timestamp:

21/03/16 14:57:07 (5 years ago)

Author:

kleanthis

Message:

Changes for the issue 23277.

Location:

mauRepo/revitalizationProject/branches/kltsa

Files:

• dpws/src/main/java/ndg/services/revitalization/ejb/discovery/CommonMethods.java (modified) (1 diff)
• dpws/src/main/java/ndg/services/revitalization/ejb/discovery/PresentHelper.java (modified) (2 diffs)
• dpws/src/main/java/ndg/services/revitalization/executor/DiscoveryServiceExecutor.java (modified) (1 diff)
• pom.xml (modified) (1 diff)

mauRepo/revitalizationProject/branches/kltsa/dpws/src/main/java/ndg/services/revitalization/ejb/discovery/CommonMethods.java

@@ -154 +154 @@
                 // NB, we use the postgres text search function to do term searches
                 StringBuffer selectSQL = new StringBuffer();
-                selectSQL.append("SELECT distinct original_document_filename, ");
+                selectSQL.append("SELECT distinct original_document_filename, discovery_id, "); /* kltsa 18/03/2016 : changes for #23277, i want to do some C. */
                 selectSQL.append(DiscoveryDictionaryDPWS.ORIGINAL_DOCUMENT_TABLE);
                 selectSQL.append(".original_document_id ");

mauRepo/revitalizationProject/branches/kltsa/dpws/src/main/java/ndg/services/revitalization/ejb/discovery/PresentHelper.java

@@ -130 +130 @@
 
                 checkWHERE_AND(whereSQL, false);
+                whereSQL.append(" ( ");  /* kltsa 21/03/2015 : changes for issue #23277 */ 
                 whereSQL.append(DiscoveryDictionaryDPWS.ORIGINAL_DOCUMENT_TABLE);
                 whereSQL.append(".original_document_filename");
@@ -145 +146 @@
                 whereSQL.append(") ");
 
-                /* ----- FORMAT ----- */
+                /* kltsa 21/03/2015 : changes for issue #23277 */                
+                whereSQL.append(" OR ");
+                whereSQL.append(DiscoveryDictionaryDPWS.ORIGINAL_DOCUMENT_TABLE);
+                whereSQL.append(".discovery_id");
+                whereSQL.append(" IN (");
+
+                Iterator<String> or_iter = documentsId.iterator();
+                while (or_iter.hasNext()) {
+                        whereSQL.append("'");
+                        whereSQL.append(or_iter.next());
+                        whereSQL.append("'");
+                        if (or_iter.hasNext()) {
+                                whereSQL.append(", ");
+                        }                               
+                }
+                whereSQL.append(") ");
+                whereSQL.append(" ) ");
+                /* ... */
+                                
+                
+                /* ----- FORMAT ----- */
                 String formType = retrieveType != null ? retrieveType.getRecordDetail() : null;
                 ListNamesItem details = null;

mauRepo/revitalizationProject/branches/kltsa/dpws/src/main/java/ndg/services/revitalization/executor/DiscoveryServiceExecutor.java

@@ -378 +378 @@
 
         private void fillDocument(ReturnSimpleType type, OriginalDocument result) {
-                type.setDocumentId(result.getOriginalDocumentFilename());
+                type.setDocumentId(result.getDiscoveryId());//kltsa 17/03/2016 : that was the original value getOriginalDocumentFilename()
         }
 }

mauRepo/revitalizationProject/branches/kltsa/pom.xml

@@ -104 +104 @@
                         <id>triton.artifactory.snapshot</id>
                         <name>triton.artifactory.snapshot</name>
-                        <url>http://triton.badc.rl.ac.uk:8180/artifactory/libs-snapshots-local</url>
+                        <url>http://mist.badc.rl.ac.uk:8180/artifactory/libs-snapshots-local</url>
                 </repository>
         </distributionManagement>