Changeset 7244 for RevitalizationWS

Timestamp:

23/07/10 17:02:59 (11 years ago)

Author:

mnagni

Message:

Improved the TermParser? to recognize phrases
Promoted the version to 1.1.0

Location:

RevitalizationWS/common/trunk

Files:

• .classpath (modified) (1 diff)
• .project (modified) (1 diff)
• .settings/org.eclipse.jdt.core.prefs (modified) (1 diff)
• .settings/org.eclipse.wst.common.component (added)
• .settings/org.eclipse.wst.common.project.facet.core.xml (added)
• pom.xml (modified) (2 diffs)
• src/main/java/META-INF (added)
• src/main/java/META-INF/MANIFEST.MF (added)
• src/main/java/ndg/common/ParserHelper.java (added)
• src/main/java/ndg/common/TermParser.java (modified) (3 diffs)
• src/main/resources/ndg/common/messages.properties (modified) (1 diff)
• src/test/java/ndg (added)
• src/test/java/ndg/common (added)
• src/test/java/ndg/common/ParserHelperTest.java (added)

RevitalizationWS/common/trunk/.classpath

@@ -5 +5 @@
         <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
         <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
-        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-        <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+        <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER">
+                <attributes>
+                        <attribute name="org.eclipse.jst.component.nondependency" value=""/>
+                </attributes>
+        </classpathentry>
+        <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+        <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.generic.runtimeTarget/JBoss v5.0">
+                <attributes>
+                        <attribute name="owner.project.facets" value="jst.utility"/>
+                </attributes>
+        </classpathentry>
+        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk6">
+                <attributes>
+                        <attribute name="owner.project.facets" value="jst.java"/>
+                </attributes>
+        </classpathentry>
         <classpathentry kind="output" path="target/classes"/>
 </classpath>

RevitalizationWS/common/trunk/.project

@@ -21 +21 @@
                         </arguments>
                 </buildCommand>
+                <buildCommand>
+                        <name>org.eclipse.wst.validation.validationbuilder</name>
+                        <arguments>
+                        </arguments>
+                </buildCommand>
         </buildSpec>
         <natures>
+                <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+                <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
                 <nature>org.eclipse.jdt.core.javanature</nature>
                 <nature>org.maven.ide.eclipse.maven2Nature</nature>

RevitalizationWS/common/trunk/.settings/org.eclipse.jdt.core.prefs

@@ -1 @@
-#Thu Jul 08 12:10:44 BST 2010
+#Mon Jul 19 10:00:14 BST 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.source=1.6

RevitalizationWS/common/trunk/pom.xml

@@ -5 +5 @@
         <groupId>ndg.services</groupId>
         <artifactId>common</artifactId>
-        <version>1.0.0</version>
+        <version>1.1.0</version>
 
         <name>NDG commons</name>
@@ -46 +46 @@
                         <version>1.5.10</version>
                 </dependency>
+
+                <dependency>
+                        <groupId>junit</groupId>
+                        <artifactId>junit</artifactId>
+                        <version>4.8.1</version>
+                        <scope>test</scope>
+                </dependency>
         </dependencies>
 

RevitalizationWS/common/trunk/src/main/java/ndg/common/TermParser.java

@@ -1 +1 @@
 package ndg.common;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.regex.Pattern;
 
@@ -19 +21 @@
 
 /**
- * @author Maurizio Nagni <maurizio.nagni@stcf.ac.uk>
- *
+ * Parse a sentence identifying the operators among the words/phrases.
+ * The single phrase should be among a double quotes (ie ""Industrial Activity"")
+ * The parser recognizes several operator (if not included in a single phrase):
+ * <li>
+ * <ol>
+ * &, AND
+ * </ol>
+ * <ol>
+ * |, or
+ * </ol>
+ * <ol>
+ * -, !, not
+ * </ol> 
+ * <li>
+ * @author Maurizio Nagni <maurizio.nagni@stcf.ac.uk> 
  */
 public class TermParser {
         public String parseTerm(String term) throws AssembleQueryException {
-                String items[] = term.split("\\s");
+                if (term == null || term.length() == 0)
+                        return "";
+                
+                String items[] = extractWordPhrase(term.trim());
+                
+                //String items[] = term.split("\\s");
 
                 int index = 0;
@@ -119 +139 @@
                 return Pattern.matches("^:$", item);
         }
+        
+        private String[] extractWordPhrase(String term) {
+                List<String> ret = new ArrayList<String>();
+
+                if (term.length() == 0)
+                        return new String[]{};
+                
+                int start = 0;
+                int stop = 0;
+                int grouperIndex = 0;
+                int spaceIndex = 0;
+                String item = null;
+                        
+                while (true) {
+                        grouperIndex = findAssociator(term, start);
+                        spaceIndex = findSpace(term, start);
+                
+                        if (grouperIndex == -1 && spaceIndex == -1)
+                                break;
+                        
+                        if ((grouperIndex == -1 && spaceIndex != -1)
+                                        || (grouperIndex != -1 && spaceIndex != -1 && grouperIndex > spaceIndex)) {
+                                stop = findSpace(term, start);
+                                ret.add(term.substring(start, stop));
+                                start = stop + 1;
+                                continue;
+                        }
+                                
+                        if ((grouperIndex != -1 && spaceIndex == -1)
+                                        || (grouperIndex != -1 && spaceIndex != -1 && grouperIndex < spaceIndex)) {
+                                stop = findAssociator(term, start+2);                                   
+                                ret.add("''" + term.substring(start+2, stop) + "''");   
+                                start = stop + 2;
+                                continue;
+                        }                                       
+                }
+                return ret.toArray(new String[0]);
+        }
+        
+        private int findAssociator(String term, int fromOffset) {
+                return term.indexOf("\"\"", fromOffset);
+        }
+        
+        private int findSpace(String term, int fromOffset) {
+                return term.indexOf(" ", fromOffset);
+        }
 }

RevitalizationWS/common/trunk/src/main/resources/ndg/common/messages.properties

@@ -16 +16 @@
 empty.searchcriteria = "SearchCriteria cannot be empty";
 term.target.syntax.error = "The Term {0} has wrong syntax";
-execution.error = The command {0} reported the following error: \n {1}
+execution.error = The command {0} reported the following error\: \n {1}
+null.object = The {0} parameter is null
+no.object.with.id = No {0} object exists with id \= {1} 
+more.objects.with.id = More than one {0} objects exist with id = {1}
+illegal.sql.operation = The process illegally called the following SQL\: \n {0}
+string.not.number = The parameter {0} with value {1} is not a parsable number  
+no.harvester.found = No harvester has been found associated for ID:{0} Type: {1}