diff options
| author | Paulina Jankowska <paulinkaj1@gmail.com> | 2013-09-06 08:55:54 (GMT) |
|---|---|---|
| committer | Paulina Jankowska <paulinkaj1@gmail.com> | 2013-09-06 08:55:54 (GMT) |
| commit | 013b1b6507ac7e7defdbb3628f742022beb056bd (patch) | |
| tree | 63190876475763cb6c6acf8ee0d6d443de2725d8 | |
| parent | bf269fdd5b4f1a06387bc8a9181412cba57f3d0e (diff) | |
| download | QCG-Data-013b1b6507ac7e7defdbb3628f742022beb056bd.zip QCG-Data-013b1b6507ac7e7defdbb3628f742022beb056bd.tar.gz QCG-Data-013b1b6507ac7e7defdbb3628f742022beb056bd.tar.bz2 | |
Last changes
| -rwxr-xr-x | idrop-web/grails-app/conf/Config.groovy | 5 | ||||
| -rw-r--r-- | idrop-web/grails-app/controllers/org/irods/mydrop/controller/MetadataSearchController.groovy | 8 |
2 files changed, 12 insertions, 1 deletions
diff --git a/idrop-web/grails-app/conf/Config.groovy b/idrop-web/grails-app/conf/Config.groovy index db1bb49..3577777 100755 --- a/idrop-web/grails-app/conf/Config.groovy +++ b/idrop-web/grails-app/conf/Config.groovy @@ -18,9 +18,14 @@ environments { production { grails.serverURL = "http://iren-web.renci.org:8080/${appName}" } production { grails.serverURL = "http://srbbrick15.ucsd.edu:1525//${appName}" } production { grails.serverURL = "http://www.irods.org" } */ + production { grails.serverURL = "http://elder10.man.poznan.pl:8090/${appName}" } + development { grails.serverURL = "http://elder10.man.poznan.pl:8090/${appName}" } + test { grails.serverURL = "http://elder10.man.poznan.pl:8090/${appName}" } +/* production { grails.serverURL = "http://localhost:8080/${appName}" } development { grails.serverURL = "http://localhost:8080/${appName}" } test { grails.serverURL = "http://localhost:8080/${appName}" } +*/ } /* diff --git a/idrop-web/grails-app/controllers/org/irods/mydrop/controller/MetadataSearchController.groovy b/idrop-web/grails-app/controllers/org/irods/mydrop/controller/MetadataSearchController.groovy index 30b8807..f9dd3fb 100644 --- a/idrop-web/grails-app/controllers/org/irods/mydrop/controller/MetadataSearchController.groovy +++ b/idrop-web/grails-app/controllers/org/irods/mydrop/controller/MetadataSearchController.groovy @@ -109,7 +109,13 @@ class MetadataSearchController { for(AVUCommand avu in avuNode.AVUs) { metadataQuery.clear() metadataQuery.add(AVUQueryElement.instanceForValueQuery(AVUQueryPart.ATTRIBUTE, AVUQueryOperatorEnum.EQUAL, avu.attribute)); - metadataQuery.add(AVUQueryElement.instanceForValueQuery(AVUQueryPart.VALUE, chooseOperator(avu.operator), avu.value)); + if((avu.value).isNumber() && avu.operator in ["<", "<=", ">="]) //">" + { + metadataQuery.add(AVUQueryElement.instanceForValueQuery(AVUQueryPart.VALUE, chooseNumOperator(avu.operator), avu.value)); + } else { + metadataQuery.add(AVUQueryElement.instanceForValueQuery(AVUQueryPart.VALUE, chooseOperator(avu.operator), avu.value)); + } + if(!avu.unit.empty){ metadataQuery.add(AVUQueryElement.instanceForValueQuery(AVUQueryPart.UNITS, AVUQueryOperatorEnum.EQUAL, avu.unit)); } |