Changeset 2447

Timestamp:

11/30/09 22:57:19 (2 years ago)

Author:

mswertz

Message:

Formatting.

File:

• molgenis/3.3/src/org/molgenis/framework/server/AbstractMolgenisServlet.java (modified) (18 diffs)

molgenis/3.3/src/org/molgenis/framework/server/AbstractMolgenisServlet.java

@@ -111 +111 @@
          * @return package name of this molgenisvariant.
          */
-        //public static abstract String getMolgenisVariantID();
+        // public static abstract String getMolgenisVariantID();
 
         /**
@@ -151 +151 @@
                                 this.handleRAPIrequest(request, response);
                         }
-                        else if (path != null && path.contains("/api/soap"))
+                        else if (path != null && (path.contains("/api/soap") ||  path.contains("/api/rest")) )
                         {
                                 this.handleSOAPrequest(request, response);
                         }
-                        else if (path != null && path.contains("/xref/find"))
+                        if (path != null && path.contains("/xref/find"))
                         {
                                 this.handleXREFrequest(request, response);
@@ -167 +167 @@
 
                                 RestInterface.handleRequest(request, response, getDatabase());
-
                         }
                         else
@@ -195 +194 @@
                 response.setBufferSize(10000);
                 response.setContentType("text/html; charset=UTF-8");
-                
+
                 // get the relative path
                 String filename = request.getRequestURI().substring(
@@ -233 +232 @@
                 // delegate to CXF servlet
                 // load the bus if needed
-                if (this.cxfLoaded == false && this.getSoapImpl() != null)
+                if (this.cxfLoaded == false && (this.getSoapImpl() != null || this.getRestImpl() != null))
                 {
                         super.loadBus(this.getServletConfig());
                         Bus bus = this.getBus();
                         BusFactory.setDefaultBus(bus);
-                        Endpoint.publish("/", this.getSoapImpl());
+                        Endpoint.publish("/soap/", this.getSoapImpl());
+                        //Endpoint.publish("/rest/", this.getSoapImpl());
+
                         this.cxfLoaded = true;
                 }
@@ -253 +254 @@
                 {
                         db = getDatabase();
-                        //db.beginTx(); DISCUSSION
+                        // db.beginTx(); DISCUSSION
                         logger.info("created database " + db);
                 }
@@ -319 +320 @@
                         // action == download, but now in a standard way, handled by
                         // controller
-                        else if (ScreenModel.SHOW_DOWNLOAD.equals(requestTuple.getString(ScreenModel.INPUT_SHOW)))
+                        else if (ScreenModel.Show.SHOW_DOWNLOAD.equals(requestTuple.getString(FormModel.INPUT_SHOW)))
                         {
                                 // get the screen that will hande the download request
@@ -340 +341 @@
                         else
                         {
-
+                                
                                 molgenis.getController().handleRequest(db, requestTuple);
                                 // handle request
                                 molgenis.getController().reload(db); // reload the application
+                                logger.debug("reloaded "+molgenis.getName()+" screen, rendering...");
 
                                 // ((UserInterface)molgenis).getDatabase().close();
@@ -366 +368 @@
                                 args.put("title", molgenis.getLabel());
                                 args.put("application", molgenis);
-//                              args.put("username", userLogin.getUserName());
+                                // args.put("username", userLogin.getUserName());
 
                                 // FIXME complex screen handling
-                                String show = requestTuple.getString(ScreenModel.INPUT_SHOW);
+                                String show = requestTuple.getString(FormModel.INPUT_SHOW);
                                 if (show != null)
                                 {
@@ -375 +377 @@
 
                                         // if dialog, only show target
-                                        if (ScreenModel.SHOW_DIALOG.equals(show))
+                                        if (ScreenModel.Show.SHOW_DIALOG.equals(show))
                                         {
                                                 FormModel target = (FormModel) molgenis.get(requestTuple.getString("__target"));
@@ -408 +410 @@
                                 writer.close();
                         }
-                        //db.commitTx(); DISCUSSION
+                        // db.commitTx(); DISCUSSION
                 }
                 catch (Exception e)
@@ -418 +420 @@
                         // throw new RuntimeException(e);
                 }
-
 
         }
@@ -489 +490 @@
                         filename = filename.replace(".", "/");
                         filename = filename.substring(0, filename.length() - 2) + ".R";
-                        //map to hard drive, minus path papp/servlet
-                        File root = new File(this.getClass().getResource("source.R").getFile()).getParentFile().getParentFile().getParentFile();
-
-                        if(filename.equals("source.R"))
+                        // map to hard drive, minus path papp/servlet
+                        File root = new File(this.getClass().getResource("source.R").getFile()).getParentFile().getParentFile()
+                                        .getParentFile();
+
+                        if (filename.equals("source.R"))
                         {
                                 root = new File(root.getAbsolutePath() + "/app/servlet");
                         }
                         File source = new File(root.getAbsolutePath() + "/" + filename);
-                        
-                        //up to root of app     
+
+                        // up to root of app
                         logger.info("trying to load R file: " + filename + " from path " + source);
-                        if(source.exists())
+                        if (source.exists())
                         {
                                 this.writeURLtoOutput(source.toURL(), out);
-                        } else
+                        }
+                        else
                         {
                                 out.write("File '" + filename + "' not found");
@@ -690 +693 @@
                 // setup the output-stream
                 response.setBufferSize(10000);
-                response.setContentType("text/html; charset=UTF-8");            
+                response.setContentType("text/html; charset=UTF-8");
 
                 logger.info("upload service started");
@@ -995 +998 @@
                         Tuple req = new HttpServletRequestTuple(request);
 
-                        String xref_entity = Class.forName(req.getString("xref_entity")).getSimpleName();;
-                        String xref_field = xref_entity + "."+req.getString("xref_field");
-                        String xref_label = xref_entity + "." +(String) req.getList("xref_label").get(0);
+                        String xref_entity = Class.forName(req.getString("xref_entity")).getSimpleName();
+                        ;
+                        String xref_field = xref_entity + "." + req.getString("xref_field");
+                        String xref_label = xref_entity + "." + (String) req.getList("xref_label").get(0);
                         List<QueryRule> xref_filters = QueryRuleUtil.fromRESTstring(req.getString("xref_filters"));
                         String xref_label_search = req.getString("xref_label_search");
@@ -1003 +1007 @@
                         logger.debug(xref_entity + " " + xref_field + " " + xref_label + " " + xref_label_search);
                         List<String> queryFields = new ArrayList<String>();
-                        queryFields.add( xref_field);
-                        queryFields.add( xref_label);
+                        queryFields.add(xref_field);
+                        queryFields.add(xref_label);
 
                         // create a CustomQuery
                         JoinQuery q = getDatabase().query(queryFields);
                         q.addRules(xref_filters);
-                        if (xref_label_search != null && xref_label_search != "") 
+                        if (xref_label_search != null && xref_label_search != "")
                         {
                                 q.like((String) xref_label, "%" + xref_label_search + "%");
-                                q.orderASC((String) xref_label);
+                                q.sortASC((String) xref_label);
                         }
                         q.limit(100);
-
 
                         List<Tuple> result = q.find();
@@ -1025 +1028 @@
                         for (int i = 0; i < result.size(); i++)
                         {
-                                //logger.debug("using: " + result.get(i));
+                                // logger.debug("using: " + result.get(i));
                                 if (i > 0) out.write(",");
                                 out.write(result.get(i).getString(xref_field) + ":\"");
@@ -1042 +1045 @@
                 }
         }
+
+        public Object getRestImpl() throws DatabaseException, NamingException
+        {
+                // TODO Auto-generated method stub
+                return null;
+        }
 }