Changeset 8597

Timestamp:

02/10/12 15:10:46 (8 years ago)

Author:

gparton

Message:

have re-factored ID calls to use new JSON object. Added past citations back in

Location:

mauRepo/MolesManager/trunk/cedaMoles/MolesManager

Files:

• settings_local.py (modified) (1 diff)
• static/js/cedaObservation.js (modified) (14 diffs)
• static/js/cedaol.js (modified) (2 diffs)

mauRepo/MolesManager/trunk/cedaMoles/MolesManager/settings_local.py

@@ -2 +2 @@
 # Override settings.py for local configuration here
 #
-SERVE_LOCAL_STATIC_FILE = False
+SERVE_LOCAL_STATIC_FILE = True
 if SERVE_LOCAL_STATIC_FILE:
     STATIC_URL = 'http://127.0.0.1:8000/static/'
-#RUN_MIGRATION = False
-

mauRepo/MolesManager/trunk/cedaMoles/MolesManager/static/js/cedaObservation.js

@@ -7 +7 @@
    //      }
         
-        function getIDs(coObs){
+        function getIDs(idArray){
                 var idDict = {};
-                for (loopVal=0; loopVal<coObs.identifier.length; loopVal++){
+                for (loopVal=0; loopVal<idArray.length; loopVal++){
                         var innerDict = {};
-                        innerDict['code'] = coObs.identifier[loopVal].code;
+                                        
+                        innerDict['code'] = idArray[loopVal].code;
                         
                         try {
-                                if (coObs.identifier[loopVal].authority.title == 'DOI'){
-                                        innerDict['doiDate'] = (coObs.identifier[loopVal].authority.hasOwnProperty('date') &&  coObs.identifier[loopVal].authority.date.length != 0 )?coObs.identifier[loopVal].authority.date.dateTime8601.year:coObs.resultTime.position.dateTime8601.year;
+                                if (idArray[loopVal].authority.title == 'DOI'){
+                                        innerDict['doiDate'] = (idArray[loopVal].authority.hasOwnProperty('date') &&  idArray[loopVal].authority.date.length != 0 )?idArray[loopVal].authority.date[0].year :'undefined';
                                 }
                         }
@@ -22 +23 @@
                         }
                         try {
-                                idDict[coObs.identifier[loopVal].authority.title] = innerDict;
+                                idDict[idArray[loopVal].authority.title] = innerDict;
                         }
                         catch(err){
-                                console.log('empty title field')
+                                console.log('empty id field')
                         }
                         
@@ -47 +48 @@
         }
         
-        function timeLead0(timeElement){
-                console.log(timeElement.length)
+        function timeLead(timeElement){
                 if (timeElement.length == 1){
-                        //console.log(timeElement)
+                        console.log(timeElement)
                         timeElement =  '0' + timeElement;
+                        console.log(timeElement)
                 } 
                 return timeElement;
@@ -57 +58 @@
         }
         
-        function publicationDetails(coObs_old,ids){
+        function publicationDetails(coObs,ids){
                 var pubDetails = {};
                 var typePub=(ids.hasOwnProperty('DOI'))?"Dataset is Citable <br /> additional metadata fields may be added ": coObs_old.publicationState.value;
@@ -65 +66 @@
                         
                 try {
-                        pubDetails['pubYear'] = coObs.resultTime.position.dateTime8601.year;
-                        pubDetails['pubMonth'] = timeLead0(coObs.resultTime.position.dateTime8601.month)
-                        pubDetails['pubDay'] = timeLead0(coObs.resultTime.position.dateTime8601.day)
+                        pubDetails['pubYear'] = coObs_old.resultTime.position.dateTime8601.year;
+                        pubDetails['pubMonth'] = timeLead(coObs_old.resultTime.position.dateTime8601.month);
+                        console.log(timeLead(coObs_old.resultTime.position.dateTime8601.month.timeElement))
+                        pubDetails['pubDay'] = timeLead(coObs_old.resultTime.position.dateTime8601.day).timeElement;
         
                         }
@@ -75 +77 @@
                         pubDetails['pubDay'] = ''
                 }
+                console.log('try',pubDetails['pubMonth'])
                 pubDetails['pubString'] = '<p> Record Status: <b>'+ pubDetails['pubType'] +'</b><br /> Available: <b>' + pubDetails['pubYear'] +'-'+ pubDetails['pubMonth'] + '-' + pubDetails['pubDay']+'</b></p>';
                 return pubDetails
@@ -331 +334 @@
                                         }
                                         
-                                        var ids = getIDs(old_coObs);
+                                        var ids = getIDs(coObs.identifier);
                                         var pubDetails_old = publicationDetails(old_coObs,ids);
                                         var old_rps = getRelatedParties(old_coObs);
@@ -342 +345 @@
                                         }
                                         
-                                        coObs.resultTime.year
-                                        coObs.resultTime.month
-                                        coObs.resultTime.day
-                                        
-                                        var pubString = '<p> Record Status: <b>'+ pubDetails_old['pubType'] +'</b><br /> Available: <b>' + coObs.resultTime.year +'-'+ coObs.resultTime.month + '-' + coObs.resultTime.day +'</b></p>';
+                                        
+                                        var pubString = '<p> Record Status: <b>'+ pubDetails_old['pubType'] +'</b><br /> Available: <b>' + coObs.resultTime.year +'-'+ timeLead(coObs.resultTime.month) + '-' + timeLead(coObs.resultTime.day) +'</b></p>';
                                         var pubDetails_id  = new dojo.html.set(dojo.byId("pubDetails_id"),pubString); 
                                         
@@ -355 +355 @@
                                          citation_id.startup();
                                          
-                                         var dataLineage_id  = new dojo.html.set(dojo.byId("dataLineage_id"),'<p>' + coObs.dataLineage + '</p>');
                                          var description_id = new dijit.TitlePane(
                                          {
@@ -361 +360 @@
                                           },"description_id");
                                          description_id.startup();                       
+                                         
+                                         if (ids.hasOwnProperty("moles2url")){
+                                                 var pastCitation_id = new dijit.TitlePane(
+                                                 {
+                                                         title: "Previous Identifiers Used:", content: '<a href="'+ids['moles2url'].code+'">'+ids['moles2url'].code+'</a>', open: 0
+                                                 },"pastCitation_id");
+                                                 pastCitation_id.startup();
+                                         }
                                         
                                         var dataLink_id = new dojo.html.set(dojo.byId("datalink_id"),downloadLink(old_coObs.result));
@@ -374 +381 @@
                                         // following line is used to do the call to map object in cedaol JS file:
                                         // uncomment to implement - removed at present due to issue with openlayers.
+                                        
                                         try {
                                                 cedaol.drawMap(coObs.geographicExtent,'map',ids);
@@ -385 +393 @@
                                          },"bbox_id");
                                          bbox_id.startup();
-                                        
+                                         
+                        //lower tab area content
+                                        
+                                        var dataLineage_id  = new dojo.html.set(dojo.byId("dataLineage_id"),'<p>' + coObs.dataLineage + '</p>');
+                                         
                                 }
                 // below is old stuff that is being re-worked to seciton above.
@@ -395 +407 @@
                                                 console.log(coObs.identifier.length)
                                         }
-                                        var title_id  = new dojo.html.set(dojo.byId("title_id"),'<h3>'+ids['ceda_title'].code+'</h3>'); 
-
+                                        
                                         // var rps = getRelatedParties(coObs);
                                          
@@ -412 +423 @@
                                         //  citation_id.startup();
                                         
-                                        // if (ids.hasOwnProperty("moles2url")){
-                                                // var pastCitation_id = new dijit.TitlePane(
-                                                // {
-                                                        // title: "Previous Identifiers Used:", content: '<a href="'+ids['moles2url'].code+'">'+ids['moles2url'].code+'</a>', open: 0
-                                                // },"pastCitation_id");
-                                                // citation_id.startup();
-                                        // }
                                         
                                         

mauRepo/MolesManager/trunk/cedaMoles/MolesManager/static/js/cedaol.js

@@ -10 +10 @@
         
     // This returned object becomes the defined value of this module
-    return {            
-        drawMap: function(extents, map_id,ids){
+   return {  
+        drawMap: function(extents, map_id,ids){
                 map = new OpenLayers.Map(map_id);
                         if (ids['ceda_title'].code != 'Data from Mars Analysis Correction Data Assimilation (MACDA)'){
@@ -37 +37 @@
                 style: layer_style,
                 renderers: renderer})
-                
+          
                 var boxes  = new OpenLayers.Layer.Vector( "Boxes" );            
                         for (var i = 0; i < extents.length; i++) {