Changeset 7634

Timestamp:

07/29/10 15:36:42 (6 weeks ago)

Author:

atarkowska

Message:

merging r7632 and r7633

Location:

branches/Beta4.2/components/tools

Files:

• OmeroPy/src/omero/gateway/__init__.py (modified) (1 diff)
• OmeroPy/src/omero/plugins/web.py (modified) (1 diff)
• OmeroWeb/omeroweb/extlib/gateway.py (modified) (3 diffs)
• OmeroWeb/omeroweb/settings.py (modified) (2 diffs)
• OmeroWeb/omeroweb/webadmin/views.py (modified) (1 diff)
• OmeroWeb/omeroweb/webclient/resources.py (deleted)
• OmeroWeb/omeroweb/webclient/urls.py (modified) (1 diff)
• OmeroWeb/omeroweb/webclient/views.py (modified) (1 diff)

branches/Beta4.2/components/tools/OmeroPy/src/omero/gateway/__init__.py

@@ -939 +939 @@
             
         self._ctx = self._proxies['admin'].getEventContext()
-        self._userid = self._ctx.userId
-        self._user = self.getExperimenter(self._userid)
+        if self._ctx is not None:
+            self._userid = self._ctx.userId
+            # "guest" user has no access that method.
+            self._user = self._ctx.userName!="guest" and self.getExperimenter(self._userid) or None
+        else:
+            self._userid = None
+            self._user = None
+        
         if self._session_cb: #pragma: no cover
             if self._was_join:

branches/Beta4.2/components/tools/OmeroPy/src/omero/plugins/web.py

@@ -44 +44 @@
 
         start = parser.add(sub, self.start, "Primary start for webserver")
-        start.add_argument("host", nargs="*")
-        start.add_argument("port", nargs="*")
+        start.add_argument("host", nargs="?")
+        start.add_argument("port", nargs="?")
 
         server = parser.add(sub, self.server, "Advanced use: Set to 'default' for django internal webserver or 'fastcfgi'")

branches/Beta4.2/components/tools/OmeroWeb/omeroweb/extlib/gateway.py

@@ -75 +75 @@
     def connect (self, *args, **kwargs):
         rv = super(OmeroWebGateway, self).connect(*args,**kwargs)
-        try:
+        if self._ctx.userName!="guest":
             self.removeGroupFromContext()
-        except omero.SecurityViolation:
-            pass
         return rv
 
@@ -261 +259 @@
         rep_serv = self.getRepositoryInfoService()
         return rep_serv.getFreeSpaceInKilobytes() * 1024
+    
+    def getUsage(self):
+        """ Returns list of users and how much space each of them use."""
+       
+        query_serv = self.getQueryService()
+        usage = dict()
+        if self.getUser().isAdmin():
+            admin_serv = self.getAdminService()
+            groups = admin_serv.lookupGroups()
+            for group in groups:
+                for gem in group.copyGroupExperimenterMap():
+                    exp = gem.child
+                    res = query_serv.projection("""
+                    select o.id, sum(p.sizeX * p.sizeY * p.sizeZ), p.pixelsType.value 
+                    from Pixels p join p.details.owner o 
+                    group by o.id, p.pixelsType.value
+                    """, None, {"omero.group":str(group.id.val)})
+                    rv = unwrap(res)
+                    for r in rv:
+                        if usage.has_key(r[0]):
+                            usage[r[0]] += r[1]*self.bytesPerPixel(r[2])
+                        else:
+                            usage[r[0]] = r[1]*self.bytesPerPixel(r[2])
+        else:
+            groups = self.getEventContext().memberOfGroups
+            groups.extend(self.getEventContext().leaderOfGroups)
+            groups = set(groups)
+            for gid in groups:
+                res = query_serv.projection("""
+                select o.id, sum(p.sizeX * p.sizeY * p.sizeZ), p.pixelsType.value 
+                from Pixels p join p.details.owner o 
+                group by o.id, p.pixelsType.value
+                """, None, {"omero.group":str(gid)})
+                rv = unwrap(res)
+                for r in rv:
+                    if usage.has_key(gid):
+                        usage[gid] += r[1]*self.bytesPerPixel(r[2])
+                    else:
+                        usage[gid] = r[1]*self.bytesPerPixel(r[2])
+        return usage
     
     def getUsage(self):
@@ -1375 +1413 @@
             else:
                 ann = meta.loadAnnotations("Experimenter", [long(oid)], None, None, None).get(long(oid), [])
-            if ann is not None:
+            if len(ann) > 0:
                 ann = ann[0]
                 store = self.createRawFileStore()

branches/Beta4.2/components/tools/OmeroWeb/omeroweb/settings.py

@@ -32 +32 @@
 import omero
 import omero.clients
-
+import tempfile 
 
 # CUSTOM CONFIG
@@ -175 +175 @@
 IGNORABLE_404_ENDS = ('*.ico')
 
+# Other option: "django.contrib.sessions.backends.cache_db"; "django.contrib.sessions.backends.cache"; "django.contrib.sessions.backends.file"
+SESSION_ENGINE = "django.contrib.sessions.backends.file" 
+SESSION_FILE_PATH = tempfile.gettempdir()
+
 # Cache
-CACHE_BACKEND = 'file:///var/tmp/django_cache'
-CACHE_TIMEOUT = 86400
-
-SESSION_ENGINE = "django.contrib.sessions.backends.cache" # Other option: "django.contrib.sessions.backends.cache_db"; "django.contrib.sessions.backends.cache"; "django.contrib.sessions.backends.file"
-#SESSION_FILE_PATH = tempfile.gettempdir()
+#CACHE_BACKEND = 'file:///var/tmp/django_cache'
+#CACHE_TIMEOUT = 86400
 
 # Cookies config

branches/Beta4.2/components/tools/OmeroWeb/omeroweb/webadmin/views.py

@@ -82 +82 @@
 def getGuestConnection(host, port):
     conn = None
-    guest = ["guest", "guest"]
+    guest = "guest"
     try:
         # do not store connection on connectors
-        conn = _createConnection('', host=host, port=port, username=guest[0], passwd=guest[1], secure=True)
+        conn = _createConnection('', host=host, port=port, username=guest, passwd=guest, secure=True)
         if conn is not None:
             logger.info("Have connection as Guest")

branches/Beta4.2/components/tools/OmeroWeb/omeroweb/webclient/urls.py

@@ -107 +107 @@
     url( r'^spellchecker/$', views.spellchecker, name="spellchecker"), 
     
+    
+    url( r'^applet/$', views.testApplet, name="testApplet"),
+    url( r'^binary/(?P<name>[^/]+)$', views.getBinary, name="testBinary"), 
+    
 )

branches/Beta4.2/components/tools/OmeroWeb/omeroweb/webclient/views.py

@@ -2391 +2391 @@
     return webgateway_views.render_split_channel(request, iid, z, t, _conn=conn, **kwargs)
 
+
+####################################################################################
+# em
+@isUserConnected
+def testApplet(request, **kwargs):
+    template = "webclient/oav.html"
+            
+    context = {}
+    t = template_loader.get_template(template)
+    c = Context(request, context)
+    rsp = t.render(c)
+    return HttpResponse(rsp)
+
+@isUserConnected
+def getBinary(request, name, **kwargs):
+    conn = None
+    try:
+        conn = kwargs["conn"]
+    except:
+        logger.error(traceback.format_exc())
+        return handlerInternalError("Connection is not available. Please contact your administrator.")
+
+    shortpath = os.path.join("/Users/ola/Dev/omero/components/tools/OmeroWeb/omeroweb/test", name)
+    from django.core.servers.basehttp import FileWrapper
+    a = FileWrapper(file(shortpath))
+    
+    rsp = HttpResponse(a)
+    
+    return rsp
+
+
 ####################################################################################
 # utils