Merge branch 'dev' of https://github.com/bioinformatics-ua/dicoogle i…

…nto dev
bioinformatics-ua · Nov 4, 2015 · 12fc60f · 12fc60f
2 parents d75ca17 + dc96ea6
commit 12fc60f
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 14 deletions.
diff --git a/...src/main/java/pt/ua/dicoogle/server/web/webapp/WEB-INF/js/components/search/searchView.js b/...src/main/java/pt/ua/dicoogle/server/web/webapp/WEB-INF/js/components/search/searchView.js
@@ -131,12 +131,8 @@ var Search = React.createClass({
           requestedQuery: params
         })
     },
-    isKeyword: function(freetext){
-      for(var i=0; i<DimFields.length;i++) {
-          if((freetext.indexOf(DimFields[i])) != -1) {
-            return true;
-          }
-        }
+    isKeyword: function(freetext) {
+      return !!freetext.match(/[^\s\\]:\S/);
     },
   isAutocompletOpened:function(){
     if($('.ui-autocomplete').css('display')==='none'){return false;}

diff --git a/dicoogle/src/main/java/pt/ua/dicoogle/server/web/webapp/WEB-INF/js/constants/dimFields.js b/dicoogle/src/main/java/pt/ua/dicoogle/server/web/webapp/WEB-INF/js/constants/dimFields.js
@@ -27,6 +27,7 @@ var DimFields = [
 ,"StudyDate"
 ,"PatientTelephoneNumbers"
 ,"SOPInstanceUID"
-,"PatientName"];
+,"PatientName"
+,"SliceLocation"];
 
 export {DimFields};
diff --git a/dicoogle/src/main/java/pt/ua/dicoogle/server/web/webapp/WEB-INF/package.json b/dicoogle/src/main/java/pt/ua/dicoogle/server/web/webapp/WEB-INF/package.json
@@ -59,7 +59,7 @@
     "react-bootstrap": "^0.25.2",
     "react-bootstrap-table": "^0.9.17",
     "react-imageloader": "~2.0.0",
-    "react-router": "^1.0.0-rc1",
+    "react-router": "^1.0.0-rc4",
     "react-router-bootstrap": "^0.19.3",
     "reflux": "^0.2.12",
     "rimraf": "latest",
@@ -77,10 +77,10 @@
     "css": "sass sass/dicoogle.scss:css/dicoogle.css",
     "html": "htmlprocessor index-template.html -o index.html -e dist -s",
     "debug": "parallelshell \"npm run js-debug\" \"npm run html-debug\"",
-    "js-debug": "NODE_ENV=development DICOOGLE_BASE_URL=\"http://localhost:8080\" browserify -d -r react -r dicoogle-webcore . > js/bundle.js",
+    "js-debug": "NODE_ENV=development browserify -d -r react -r dicoogle-webcore . > js/bundle.js",
     "html-debug": "htmlprocessor index-template.html -o index.html -e dev -s",
     "css:watch": "sass --watch sass/dicoogle.scss:css/dicoogle.css",
-    "js:watch": "NODE_ENV=development DICOOGLE_BASE_URL=\"http://localhost:8080\" watchify -o js/bundle.js -v -d -r react -r dicoogle-webcore .",
+    "js:watch": "NODE_ENV=development watchify -o js/bundle.js -v -d -r react -r dicoogle-webcore .",
     "test": "jest",
     "clean": "rimraf js/bundle.js js/bundle.min.js css/dicoogle.css css/dicoogle.css.map index.html"
   },

diff --git a/sdk/src/main/java/pt/ua/dicoogle/sdk/IndexerInterface.java b/sdk/src/main/java/pt/ua/dicoogle/sdk/IndexerInterface.java
@@ -39,7 +39,7 @@ public interface IndexerInterface extends DicooglePlugin {
      * @param file directory or file to index
      * @return a representation of the asynchronous indexation task
      */
-    public Task<Report> index(StorageInputStream file);
+    public Task<Report> index(StorageInputStream file, Object ... parameters);
 
     /**
      * Indexes multiple file paths to the database. Indexation procedures are asynchronous, and will return
@@ -49,7 +49,7 @@ public interface IndexerInterface extends DicooglePlugin {
      * @param files a collection of directories and/or files to index
      * @return a representation of the asynchronous indexation task
      */
-    public Task<Report> index(Iterable<StorageInputStream> files);
+    public Task<Report> index(Iterable<StorageInputStream> files, Object ... parameters);
 
 
     /**

diff --git a/sdk/src/main/java/pt/ua/dicoogle/sdk/StorageInterface.java b/sdk/src/main/java/pt/ua/dicoogle/sdk/StorageInterface.java
@@ -69,7 +69,7 @@ public interface StorageInterface extends DicooglePlugin {
      * @param dicomObject Object to be Stored
      * @return The URI of the previously stored Object.
      */
-    public URI store(DicomObject dicomObject);
+    public URI store(DicomObject dicomObject, Object ... parameters);
 
     /**
      * Stores a new element into the storage.
@@ -78,7 +78,7 @@ public interface StorageInterface extends DicooglePlugin {
      * @return the URI of the stored data
      * @throws IOException if an I/O error occurs
      */
-    public URI store(DicomInputStream inputStream) throws IOException;
+    public URI store(DicomInputStream inputStream, Object ... parameters) throws IOException;
 
     /** Removes an element at the given URI.
      *