hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-17 06:53:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some parsing problems with complex queries using regular expressions.

Browse Source 
git-svn-id: http://scm.dspace.org/svn/repo/trunk@650 9c30dcfa-912a-0410-8fc2-9e0234be79fd
This commit is contained in:
Greg McClellan?
2003-04-14 03:31:11 +00:00
parent 486e5b8165
commit 7c4ac4e8ef
1 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
dspace/src/org/dspace/search/QueryArgs.java
View File

@@ -1,6 +1,7 @@
package org.dspace.search;
import javax.servlet.http.HttpServletRequest;
import org.apache.oro.text.perl.Perl5Util;
public class QueryArgs
{
@@ -67,22 +68,14 @@ public class QueryArgs
String conjunction2 = request.getParameter("conjunction2");
if (query1.length() > 0)
{
if (!field1.equals("ANY")) {
newquery = newquery + field1 + ":";
}
newquery = newquery + '"' + query1 + '"';
{
newquery = newquery + buildQueryPart(query1, field1);
}
if (query2.length() > 0)
{
newquery = newquery + " " + conjunction1 + " ";
if (!field2.equals("ANY")) {
newquery = newquery + field2 + ":";
}
newquery = newquery + '"' + query2 + '"';
newquery = newquery + buildQueryPart(query2, field2);
}
newquery = newquery + ")";
@@ -90,13 +83,28 @@ public class QueryArgs
if (query3.length() > 0)
{
newquery = newquery + " " + conjunction2 + " ";
if (!field3.equals("ANY")) {
newquery = newquery + field3 + ":";
}
newquery = newquery + "\"" + query3 + "\"";
newquery = newquery + buildQueryPart(query3, field3);
}
return (newquery);
}
private String buildQueryPart (String myquery, String myfield)
{
Perl5Util util = new Perl5Util();
String newquery = "(";
String pattern = "";
if (!myfield.equals("ANY")) {
newquery = newquery + myfield + ":";
myquery = util.substitute("s/\'(.*)\'/\"$1\"/g", myquery);
if (!util.match("/\".*\"/", myquery))
{
myquery = util.substitute("s/ / " + myfield + ":/g", myquery);
}
}
newquery = newquery + myquery + ")";
return (newquery);
}
}