Changeset 2964

Timestamp:

05/31/13 14:25:44 (11 years ago)

Author:

olhsha

Message:

fixing dowble-redirection bug components->profiles->components, when component if is gived. Fixed

Location:

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex

Files:

• clarin/cmdi/componentregistry/browser/Browse.mxml (modified) (2 diffs)
• clarin/cmdi/componentregistry/services/Config.as (modified) (3 diffs)
• ru/inspirit/net/MultipartURLLoader.as (modified) (1 diff)

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/browser/Browse.mxml

@@ -189 +189 @@
                         
                         private function getSelectedIndex():int{
-                                trace(Config.instance.startupItem);
                                 if (isComponentId(Config.instance.startupItem)) {
-                                        trace("1");
                                         return 1;
                                 } else {
-                                        trace("0");
                                         return 0;
                                 }
@@ -201 +198 @@
                         private function isComponentId(id:String):Boolean{
                                 if (id==null) {return false;}
-                                var index:int=id.search("c_");
-                                if (index>-1) {
+                                var index:int=id.search(Config.COMPONENT_PREFIX);
+                                if (index!=0) {
                                         return true;
                                 } else {

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/services/Config.as

@@ -20 +20 @@
                 public static const REGISTRY_PARAM_SPACE:String = "space";
                 public static const REGISTRY_PARAM_DEBUG:String = "debug";
+                
+                // REGISTRY_ID, COMPONENT_PREFIX, and PROFILE_PREFIX must be the same as on the server!
+                // REGISTRY_ID isdefined in ComponentRegistry
+                // COMPONENT_PREFIX is defined in ComponentDescription
+                // PROFILE_PREFIX is defined in ProfileDescription
+                private static const REGISTRY_ID="clarin.eu:cr1:";
+                private static const COMPONENT_PREFIX=REGISTRY_ID+"c_";
+                private static const PROFILE_PREFIX=REGISTRY_ID+"p_";
+                
 
                 //Possible views to start with.
@@ -32 +41 @@
                 public static const SPACE_USER:String = "user";
                 public static const SPACE_PUBLIC:String = "public";
-
+                
                 private static const COMPONENT_LIST_URL:String = "/rest/registry/components";
                 private static const PROFILE_LIST_URL:String = "/rest/registry/profiles";
@@ -44 +53 @@
                 private static const COMMENTS_URL_PATH:String = "/comments/";
                 private static const ISOCAT_SERVLET:String = "/isocat";
-
-                private static var _instance:Config = new Config();
+                
+                
+                
+                public static var _instance:Config = new Config();
+                public static var COMPONENT_PREFIX;
+                public static var PROFILE_PREFIX;
 
                 private var _startupItem:String; //item to be selected at startup, can be specified as a url parameter

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/ru/inspirit/net/MultipartURLLoader.as

@@ -296 +296 @@
                         
                         addListener();
-                        
                         _loader.load(urlRequest);
                 }