r8475@libaxis1 (orig r2354): grahamtriggs | 2007-11-21 07:39:54 -0500

Fixed browsing of authors in Item Mapper so that you only need to specify a partial name


git-svn-id: http://scm.dspace.org/svn/repo/trunk@2376 9c30dcfa-912a-0410-8fc2-9e0234be79fd

dspace-api/src/main/java/org/dspace/browse/BrowseDAO.java

@@ -345,6 +345,13 @@ public interface BrowseDAO
 	 */
 	public void setFilterValue(String value);
 
+    /**
+     * Sets whether we will treat the filter value as partial (like match), or exact
+     *
+     * @param part true if partial, false if exact
+     */
+    public void setFilterValuePartial(boolean part);
+	
 	/**
 	 * Get the name of the field in which the value to constrain results is
 	 * contained

dspace-api/src/main/java/org/dspace/browse/BrowseDAOOracle.java

@@ -100,6 +100,9 @@ public class BrowseDAOOracle implements BrowseDAO
     /** value to restrict browse to (e.g. author name) */
     private String value = null;
 
+    /** exact or partial matching of the value */
+    private boolean valuePartial = false;
+    
     /** the table that defines the mapping for the relevant container */
     private String containerTable = null;
     
@@ -613,6 +616,15 @@ public class BrowseDAOOracle implements BrowseDAO
         this.rebuildQuery = true;
     }
 
+    /* (non-Javadoc)
+     * @see org.dspace.browse.BrowseDAO#setFilterValuePartial(boolean)
+     */
+    public void setFilterValuePartial(boolean part)
+    {
+        this.valuePartial = part;
+        this.rebuildQuery = true;
+    }
+
     /* (non-Javadoc)
      * @see org.dspace.browse.BrowseDAO#setValueField(java.lang.String)
      */
@@ -1029,6 +1041,21 @@ public class BrowseDAOOracle implements BrowseDAO
             buildWhereClauseOpInsert(queryBuf);
             queryBuf.append(" ");
             queryBuf.append(valueField);
+            if (valuePartial)
+            {
+                queryBuf.append(" LIKE ? ");
+
+                if (valueField.startsWith("sort_"))
+                {
+                    params.add("%" + utils.truncateSortValue(value) + "%");
+                }
+                else
+                {
+                    params.add("%" + utils.truncateValue(value) + "%");
+                }
+            }
+            else
+            {
                 queryBuf.append("=? ");
 
                 if (valueField.startsWith("sort_"))
@@ -1041,6 +1068,7 @@ public class BrowseDAOOracle implements BrowseDAO
                 }
             }
         }
+    }
     
     /**
      * Insert an operator into the where clause, and reset to ' AND '

dspace-api/src/main/java/org/dspace/browse/BrowseDAOPostgres.java

@@ -100,6 +100,9 @@ public class BrowseDAOPostgres implements BrowseDAO
     /** value to restrict browse to (e.g. author name) */
     private String value = null;
 
+    /** exact or partial matching of the value */
+    private boolean valuePartial = false;
+    
     /** the table that defines the mapping for the relevant container */
     private String containerTable = null;
     
@@ -617,6 +620,15 @@ public class BrowseDAOPostgres implements BrowseDAO
         this.rebuildQuery = true;
     }
 
+    /* (non-Javadoc)
+     * @see org.dspace.browse.BrowseDAO#setFilterValuePartial(boolean)
+     */
+    public void setFilterValuePartial(boolean part)
+    {
+        this.valuePartial = part;
+        this.rebuildQuery = true;
+    }
+    
     /* (non-Javadoc)
      * @see org.dspace.browse.BrowseDAO#setValueField(java.lang.String)
      */
@@ -1034,6 +1046,21 @@ public class BrowseDAOPostgres implements BrowseDAO
             buildWhereClauseOpInsert(queryBuf);
             queryBuf.append(" ");
             queryBuf.append(valueField);
+            if (valuePartial)
+            {
+                queryBuf.append(" LIKE ? ");
+
+                if (valueField.startsWith("sort_"))
+                {
+                    params.add("%" + utils.truncateSortValue(value) + "%");
+                }
+                else
+                {
+                    params.add("%" + utils.truncateValue(value) + "%");
+                }
+            }
+            else
+            {
                 queryBuf.append("=? ");
 
                 if (valueField.startsWith("sort_"))
@@ -1046,6 +1073,7 @@ public class BrowseDAOPostgres implements BrowseDAO
                 }
             }
         }
+    }
 
     /**
      * Insert an operator into the where clause, and reset to ' AND '

dspace-api/src/main/java/org/dspace/browse/BrowseEngine.java

@@ -291,6 +291,7 @@ public class BrowseEngine
 				// set the values in the Browse Query
 				dao.setFilterValueField("sort_value");
 				dao.setFilterValue(value);
+                dao.setFilterValuePartial(scope.getFilterValuePartial());
 			}
 			
 			// define a clause for the WHERE clause which will allow us to constraine

dspace-api/src/main/java/org/dspace/browse/BrowserScope.java

@@ -69,6 +69,9 @@ public class BrowserScope
 	/** the value to restrict the browse to */
 	private String filterValue;
 
+    /** exact or partial matching of the value */
+    private boolean filterValuePartial = false;
+
     /** the language of the value to restrict the browse to */
     private String filterValueLang;
     
@@ -494,6 +497,24 @@ public class BrowserScope
         this.filterValue = value;
     }
 
+    /**
+     * Should the filter value be treated as partial, or exact
+     * @return true if partial, false if exact
+     */
+    public boolean getFilterValuePartial()
+    {
+        return filterValuePartial;
+    }
+
+    /**
+     * Should the filter value be treated as partial, or exact
+     * @param filterValuePartial true if partial, false if exact
+     */
+    public void setFilterValuePartial(boolean filterValuePartial)
+    {
+        this.filterValuePartial = filterValuePartial;
+    }
+
     /**
      * @return Returns the language.
      */

dspace-jspui/src/main/java/org/dspace/app/webui/servlet/admin/ItemMapServlet.java

@@ -368,6 +368,7 @@ public class ItemMapServlet extends DSpaceServlet
     			bs.setBrowseIndex(bi);
     			bs.setOrder(SortOption.ASCENDING);
     			bs.setFilterValue(name);
+                bs.setFilterValuePartial(true);
     			bs.setJumpToValue(null);
     			bs.setResultsPerPage(10000);	// an arbitrary number (large) for the time being
     			bs.setSortBy(0);