Changeset 2460

Timestamp:

06/04/08 09:52:20 (22 months ago)

Author:

jmoore

Message:

OmeroSearch : Last upgrades to field names for release.

• Changed PersistentEventLogLoader's look up key to force re-indexing
• Added annotation.ns and annotation.type

Location:

trunk/components/server

Files:

• resources/ome/services/service-ome.api.Search.xml (modified) (1 diff)
• src/ome/services/fulltext/FullTextBridge.java (modified) (2 diffs)
• test/ome/server/itests/search/SearchTest.java (modified) (1 diff)

trunk/components/server/resources/ome/services/service-ome.api.Search.xml

@@ -71 +71 @@
     <property name="queryService" ref="internal:ome.api.LocalQuery"/>
     <property name="template" ref="simpleJdbcTemplate"/>
-    <property name="key" value="PersistentEventLogLoader.current_id"/>
+    <property name="key" value="PersistentEventLogLoader.v2.current_id"/>
     <property name="query" value="select value from configuration where name = ?"/>
     <property name="insert" value="insert into configuration (name, value) values (?,?)"/>

trunk/components/server/src/ome/services/fulltext/FullTextBridge.java

@@ -169 +169 @@
             List<Annotation> list = annotated.linkedAnnotationList();
             for (Annotation annotation : list) {
+                String at = annotationTypeString(annotation);
+                add(document, "annotation.type", at, store, index, boost);
+                if (annotation.getNs() != null) {
+                    add(document, "annotation.ns", annotation.getNs(), store,
+                            index, boost);
+                }
                 if (annotation instanceof TextAnnotation) {
                     TextAnnotation text = (TextAnnotation) annotation;
@@ -329 +335 @@
     }
 
+    /**
+     * Return the short type name of an {@link Annotation}. If the instance is
+     * an {@link ome.model.annotations.TextAnnotation} the returned value will
+     * be "TextAnnotation".
+     * 
+     * @param annotation
+     * @return
+     */
+    private String annotationTypeString(Annotation annotation) {
+        Class ac = Utils.trueClass(annotation.getClass());
+        int dot = ac.getName().lastIndexOf('.');
+        if (dot < 0) {
+            dot = -1;
+        }
+        String at = ac.getName().substring(dot + 1, ac.getName().length());
+        return at;
+    }
+
 }

trunk/components/server/test/ome/server/itests/search/SearchTest.java

@@ -148 +148 @@
         assertTrue(list.toString(), list.size() == 1);
 
+        list = this.iQuery.findAllByFullText(Image.class,
+                "annotation.ns:theNamespace*", null);
+        assertTrue(list.toString(), list.size() >= 1);
+
+        list = this.iQuery.findAllByFullText(Image.class,
+                "annotation.type:TagAnnotation", null);
+        assertTrue(list.toString(), list.size() >= 1);
+
     }