Changeset 1483

Timestamp:

03-02-11 10:02:15 (4 years ago)

Author:

t.w.abma@…

Message:

- fixed Search (code was committed with merge conflict messages in the source)

Files:

• trunk/src/groovy/dbnp/query/Search.groovy (modified) (3 diffs)

trunk/src/groovy/dbnp/query/Search.groovy

@@ -16 +16 @@
 package dbnp.query
 
-import dbnp.authentication.SecUser
-import groovy.lang.Closure;
-
+import nl.grails.plugins.gdt.*
+import java.util.List;
+import java.text.DateFormat;
 import java.text.SimpleDateFormat
 import java.util.List;
@@ -25 +25 @@
 import org.springframework.web.context.request.RequestContextHolder;
 import org.codehaus.groovy.grails.commons.ApplicationHolder;
+
+import dbnp.authentication.*
 
 import org.dbnp.gdt.*
@@ -47 +49 @@
         public void setResultFields( Map r ) { resultFields = r; }
 
-<<<<<<< .mine
-        public Search() {
-                ApplicationContext ctx = (ApplicationContext)ApplicationHolder.getApplication().getMainContext();
-                def authenticationService = ctx.getBean("authenticationService");
-                def sessionUser = authenticationService.getLoggedInUser();
-                
-                if( sessionUser )
-                        this.user = sessionUser;
-                else
-                        this.user = null
-        }
-        
-=======
->>>>>>> .r1481
         /**
          * Returns the number of results found by this search