Menu
▾
▴
strandmapservic-developers
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
(29) |
Mar
(269) |
Apr
(106) |
May
(12) |
Jun
(5) |
Jul
(6) |
Aug
(11) |
Sep
(153) |
Oct
(133) |
Nov
(26) |
Dec
(5) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(12) |
Feb
(8) |
Mar
(10) |
Apr
(2) |
May
(6) |
Jun
(4) |
Jul
(4) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: S C. <sl...@us...> - 2008-07-18 21:29:40
|
Update of /cvsroot/strandmapservic/smsServer/WEB-INF/Database In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv12756/WEB-INF/Database Modified Files: strandmap.sql Log Message: adjust grade ranges for the strands in 'dectecting flaws...' map and rm a bad strand-strand connection Index: strandmap.sql =================================================================== RCS file: /cvsroot/strandmapservic/smsServer/WEB-INF/Database/strandmap.sql,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** strandmap.sql 17 Jul 2008 21:16:29 -0000 1.10 --- strandmap.sql 18 Jul 2008 21:29:32 -0000 1.11 *************** *** 1872,1879 **** (NULL,NULL,'grade group','SMS-GRD-2537','6-8','Atlas of science literacy, Project 2061, 2007','6,7,8',NULL,'Accessioned','Communication Skills, grades 6-8','grades 6-8','DLESE:other,GEM:process skills,McREL:scientific collaboration and communication ','skills,convey,relay,communicate,communication,data,grades,illustrate',NULL,'en','2007-12-03',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), (NULL,NULL,'grade group','SMS-GRD-2538','9-12','Atlas of science literacy, Project 2061, 2007','9,10,11,12',NULL,'Accessioned','Communication Skills, grades 9-12','grades 9-12','DLESE:other,GEM:process skills,McREL:scientific collaboration and communication ','skills,convey,relay,communicate,communication,data,grades,illustrate',NULL,'en','2007-12-03',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), ! (NULL,NULL,'grade group','SMS-GRD-2562','K-2','Atlas of science literacy, Project 2061, 2007','K,1,2,3,4,5,6,7,8,9,10,11,12',NULL,'Accessioned','Detecting Flaws in Arguments, grades K-2','grades K-2','DLESE:other,GEM:process skills,McREL:scientific collaboration and communication ','process,flaws,understand,arguments,communicate,thought,grades,listen,k,investigate',NULL,'en','2007-12-04',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), ! (NULL,NULL,'grade group','SMS-GRD-2563','3-5','Atlas of science literacy, Project 2061, 2007','K,1,2,3,4,5,6,7,8,9,10,11,12',NULL,'Accessioned','Detecting Flaws in Arguments, grades 3-5','grades 3-5','DLESE:other,GEM:process skills,McREL:scientific collaboration and communication ','process,flaws,understand,arguments,communicate,5,thought,grades,listen,investigate',NULL,'en','2007-12-04',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), ! (NULL,NULL,'grade group','SMS-GRD-2564','6-8','Atlas of science literacy, Project 2061, 2007','K,1,2,3,4,5,6,7,8,9,10,11,12',NULL,'Accessioned','Detecting Flaws in Arguments, grades 6-8','grades 6-8','DLESE:other,GEM:process skills,McREL:scientific collaboration and communication ','process,flaws,understand,arguments,communicate,thought,grades,listen,investigate',NULL,'en','2007-12-04',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), ! (NULL,NULL,'grade group','SMS-GRD-2565','9-12','Atlas of science literacy, Project 2061, 2007','K,1,2,3,4,5,6,7,8,9,10,11,12',NULL,'Accessioned','Detecting Flaws in Arguments, grades 9-12','grades 9-12','DLESE:other,GEM:process skills,McREL:scientific collaboration and communication ','process,flaws,understand,arguments,communicate,thought,grades,listen,investigate',NULL,'en','2007-12-04',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), ('','','Grade Group','SMS-GRD-9005','K-2','Atlas of science literacy, Project 2061, 2001','K,1,2','','In process','Flow of Matter in Ecosystems, grades K-2','grades K-2','Biology','matter,ecosystems,flow,grades,k','','en','2004-03-08','Biological and life sciences,Biology,','Matter and energy in living systems','','','','','ASL-5E.1/P',''), ('','','Grade Group','SMS-GRD-9006','3-5','Atlas of science literacy, Project 2061, 2001','3,4,5','','In process','Flow of Matter in Ecosystem, grades 3-5','grades 3-5','Biology','matter,5,ecosystem,flow,grades','','en','2004-03-08','Biological and life sciences,Biology,','Matter and energy in living systems','','','','','ASL-5E.1/E',''), --- 1872,1879 ---- (NULL,NULL,'grade group','SMS-GRD-2537','6-8','Atlas of science literacy, Project 2061, 2007','6,7,8',NULL,'Accessioned','Communication Skills, grades 6-8','grades 6-8','DLESE:other,GEM:process skills,McREL:scientific collaboration and communication ','skills,convey,relay,communicate,communication,data,grades,illustrate',NULL,'en','2007-12-03',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), (NULL,NULL,'grade group','SMS-GRD-2538','9-12','Atlas of science literacy, Project 2061, 2007','9,10,11,12',NULL,'Accessioned','Communication Skills, grades 9-12','grades 9-12','DLESE:other,GEM:process skills,McREL:scientific collaboration and communication ','skills,convey,relay,communicate,communication,data,grades,illustrate',NULL,'en','2007-12-03',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), ! (NULL,NULL,'grade group','SMS-GRD-2562','K-2','Atlas of science literacy, Project 2061, 2007','K,1,2',NULL,'Accessioned','Detecting Flaws in Arguments, grades K-2','grades K-2','DLESE:other,GEM:process skills,McREL:scientific collaboration and communication ','process,flaws,understand,arguments,communicate,thought,grades,listen,k,investigate',NULL,'en','2007-12-04',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), ! (NULL,NULL,'grade group','SMS-GRD-2563','3-5','Atlas of science literacy, Project 2061, 2007','3,4,5',NULL,'Accessioned','Detecting Flaws in Arguments, grades 3-5','grades 3-5','DLESE:other,GEM:process skills,McREL:scientific collaboration and communication ','process,flaws,understand,arguments,communicate,5,thought,grades,listen,investigate',NULL,'en','2007-12-04',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), ! (NULL,NULL,'grade group','SMS-GRD-2564','6-8','Atlas of science literacy, Project 2061, 2007','6,7,8',NULL,'Accessioned','Detecting Flaws in Arguments, grades 6-8','grades 6-8','DLESE:other,GEM:process skills,McREL:scientific collaboration and communication ','process,flaws,understand,arguments,communicate,thought,grades,listen,investigate',NULL,'en','2007-12-04',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), ! (NULL,NULL,'grade group','SMS-GRD-2565','9-12','Atlas of science literacy, Project 2061, 2007','9,10,11,12',NULL,'Accessioned','Detecting Flaws in Arguments, grades 9-12','grades 9-12','DLESE:other,GEM:process skills,McREL:scientific collaboration and communication ','process,flaws,understand,arguments,communicate,thought,grades,listen,investigate',NULL,'en','2007-12-04',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), ('','','Grade Group','SMS-GRD-9005','K-2','Atlas of science literacy, Project 2061, 2001','K,1,2','','In process','Flow of Matter in Ecosystems, grades K-2','grades K-2','Biology','matter,ecosystems,flow,grades,k','','en','2004-03-08','Biological and life sciences,Biology,','Matter and energy in living systems','','','','','ASL-5E.1/P',''), ('','','Grade Group','SMS-GRD-9006','3-5','Atlas of science literacy, Project 2061, 2001','3,4,5','','In process','Flow of Matter in Ecosystem, grades 3-5','grades 3-5','Biology','matter,5,ecosystem,flow,grades','','en','2004-03-08','Biological and life sciences,Biology,','Matter and energy in living systems','','','','','ASL-5E.1/E',''), *************** *** 10510,10514 **** ('SMS-SEC-1187','SMS-CHP-1068','is part of'), ('SMS-SEC-1624','SMS-CHP-1037','is part of'), - ('SMS-STD-0027','SMS-STD-0038','Is Part Of'), ('SMS-STD-0036','SMS-MAP-0048','Is Part Of'), ('SMS-STD-0037','SMS-MAP-0048','Is Part Of'), --- 10510,10513 ---- |
|
From: John W. <jwe...@us...> - 2008-07-03 23:07:56
|
Update of /cvsroot/strandmapservic/smsServer/jsapi/api_v1/interactive_map In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv32302/jsapi/api_v1/interactive_map Modified Files: interactive_map.jsp Log Message: -fixed rendering of bubble background image in Firefox 3 Index: interactive_map.jsp =================================================================== RCS file: /cvsroot/strandmapservic/smsServer/jsapi/api_v1/interactive_map/interactive_map.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** interactive_map.jsp 12 Nov 2007 22:39:38 -0000 1.2 --- interactive_map.jsp 3 Jul 2008 23:07:53 -0000 1.3 *************** *** 146,157 **** <script type="text/javascript"> var bgClass = 'calloutImgBG'; ! if( browser.isIE6down) { bgClass = 'calloutImgBGIE6Down'; ! } ! var _co = $('_co'); ! if(_co){ ! _co.getElementsByClassName('calloutImg').each(function(el) { ! el.addClassName(bgClass); ! }); ! } </script> --- 146,154 ---- <script type="text/javascript"> var bgClass = 'calloutImgBG'; ! if(browser.isIE6down) bgClass = 'calloutImgBGIE6Down'; ! ! $$('.calloutImg').each(function(el) { ! el.addClassName(bgClass); ! }); </script> |
|
From: John W. <jwe...@us...> - 2008-07-03 23:07:56
|
Update of /cvsroot/strandmapservic/smsServer/jsapi/api_v1 In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv32302/jsapi/api_v1 Modified Files: common_styles.css Log Message: -fixed rendering of bubble background image in Firefox 3 Index: common_styles.css =================================================================== RCS file: /cvsroot/strandmapservic/smsServer/jsapi/api_v1/common_styles.css,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** common_styles.css 16 Nov 2007 15:17:11 -0000 1.3 --- common_styles.css 3 Jul 2008 23:07:53 -0000 1.4 *************** *** 112,116 **** #navOverlayBorder1 { border-color: #FF888D #551114 #551114 #FF888D; } #navOverlayBorder2 { border: 1px solid #BB4449; } ! #navOverlayFill { background-color: #CC666A; } .calloutImgFrame { --- 112,116 ---- #navOverlayBorder1 { border-color: #FF888D #551114 #551114 #FF888D; } #navOverlayBorder2 { border: 1px solid #BB4449; } ! #navOverlayFill { background-color: #CC666A; } .calloutImgFrame { |
|
From: John W. <jwe...@us...> - 2008-07-03 23:07:56
|
Update of /cvsroot/strandmapservic/smsServer/docs In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv32302/docs Modified Files: CHANGES.txt Log Message: -fixed rendering of bubble background image in Firefox 3 Index: CHANGES.txt =================================================================== RCS file: /cvsroot/strandmapservic/smsServer/docs/CHANGES.txt,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** CHANGES.txt 12 Mar 2008 17:21:05 -0000 1.6 --- CHANGES.txt 3 Jul 2008 23:07:53 -0000 1.7 *************** *** 7,10 **** --- 7,11 ---- - added new maps from Atlas II (approx 40 new maps and two new chapters) - updated visualiztion renderer to handle some issues in the new maps + - fixed rendering of bubble background image in Firefox 3 (switched from using getElementsByClassName to $$ prototype method) Changes in v1.2.10 |
|
From: John W. <jwe...@us...> - 2008-06-24 21:53:48
|
Update of /cvsroot/strandmapservic/nsdl-client-project In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv19562 Modified Files: build.xml Log Message: -Added note that the project has now been migrated over to the NSDL subversion code repository. Index: build.xml =================================================================== RCS file: /cvsroot/strandmapservic/nsdl-client-project/build.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** build.xml 25 Oct 2007 18:03:47 -0000 1.6 --- build.xml 24 Jun 2008 21:53:45 -0000 1.7 *************** *** 1,3 **** --- 1,6 ---- <!-- + NOTE: This project was migrated to the NSDL subversion code repository on June 24th, 2008. + The version that resides here on SourceForge CVS is being kept for archive purposes only. + Ant build file for the NSDL SMS Client and AAAS Benchmarks Collection view |
|
From: S C. <sl...@us...> - 2008-06-23 19:16:49
|
Update of /cvsroot/strandmapservic/nsdl-client-project/web/js In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv7837/web/js Modified Files: nsdlclientsms.js Log Message: debug=1 parameter in url provides link to results xml and tab with bm info Index: nsdlclientsms.js =================================================================== RCS file: /cvsroot/strandmapservic/nsdl-client-project/web/js/nsdlclientsms.js,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** nsdlclientsms.js 16 May 2008 21:57:13 -0000 1.8 --- nsdlclientsms.js 23 Jun 2008 19:16:46 -0000 1.9 *************** *** 29,43 **** // Use the built-in tabs for displaying related benchmarks and nses standards: infoBubble.addBuiltinTab("nses","NSES Standards"); - infoBubble.addBuiltinTab("relatedbenchmarks","Related Benchmarks"); ! // When a benchmark is selected by the user, make sure the resourcesTab is displayed: ! SMSEvent.addListener(StrandMap,"onbenchmarkselect", function() { ! infoBubble.selectTab(resourcesTab); ! }); ! // Create the 'Recommend' tab and set it's handler: recommendTab = new InfoBubbleTab('Recommend a Resource'); infoBubble.addTab(recommendTab); SMSEvent.addListener(StrandMap,"onbenchmarkselect",recommendTabCallback); } --- 29,52 ---- // Use the built-in tabs for displaying related benchmarks and nses standards: infoBubble.addBuiltinTab("nses","NSES Standards"); ! if(gup('debug') == 1){ ! // Add tabs to the Info Bubble in the order they will appear: ! benchmarkInfoTab = new InfoBubbleTab('Benchmark info'); ! infoBubble.addTab(benchmarkInfoTab); ! SMSEvent.addListener(benchmarkInfoTab,"onselect",myCallBackForBenchmarkInfoTab); ! } else { ! // Use the built-in tabs for displaying related benchmarks and nses standards: ! infoBubble.addBuiltinTab("relatedbenchmarks","Related Benchmarks"); ! } ! // Create the 'Recommend' tab and set it's handler: recommendTab = new InfoBubbleTab('Recommend a Resource'); infoBubble.addTab(recommendTab); SMSEvent.addListener(StrandMap,"onbenchmarkselect",recommendTabCallback); + + // When a benchmark is selected by the user, make sure the resourcesTab is displayed: + SMSEvent.addListener(StrandMap,"onbenchmarkselect", function() { + infoBubble.selectTab(resourcesTab); + }); } *************** *** 320,324 **** function sendResRequest(offset,displaytype,callback){ var json = StrandMap.getSelectedBenchmarkRecordJson(); ! if(!offset){ offset = 0; --- 329,333 ---- function sendResRequest(offset,displaytype,callback){ var json = StrandMap.getSelectedBenchmarkRecordJson(); ! var id = StrandMap.getSelectedBenchmarkId(); if(!offset){ offset = 0; *************** *** 327,377 **** displaytype=''; } ! if(displaytype == 'strict'){ ! var recordJson = StrandMap.getSelectedBenchmarkRecordJson(); ! var AAASCodeMod = getAAASCode(recordJson); ! var id = StrandMap.getSelectedBenchmarkId(); ! var reqUrl = "bubble/resourcesStrict.jsp?bmId="+ id + "&startingOffset=" + offset + "&displaytype="+displaytype+"&AAASCodeMod="+AAASCodeMod; } else { ! ! <!--// get the map id //--> ! var referringMapId = StrandMap.getReferringMapId(); ! if(referringMapId != null){ ! var mapId = referringMapId; ! } else { ! var mapId = StrandMap.getMapId(); ! } ! <!-- // get the grades for this benchmark //--> ! var grArray = json.itemRecord.Data.GradeRanges.GradeRange; ! switch(grArray[0]) ! { ! case 'K': ! var grades = 'K'; ! break ! case '3': ! var grades = '3'; ! break ! case '6': ! var grades = '6'; ! break ! case '9': ! var grades = '9'; ! break ! default: } ! <!-- // get the keywords for this benchmark //--> ! var kwArray = json.itemRecord.Data.Keywords.keyword; ! var keywords = ''; ! for(var i=0; i< kwArray.length; i++){ ! if(i == 0){ ! keywords += kwArray[i]; ! } else if(i == kwArray.length-1){ ! keywords += '|' + kwArray[i]; ! } else { ! keywords += '|' + kwArray[i]; ! } ! } if(mapId == 'SMS-MAP-1496' || mapId == 'SMS-MAP-1504' || mapId == 'SMS-MAP-1478' || mapId == 'SMS-MAP-1487'){ var subjects = 'social studies'; --- 336,385 ---- displaytype=''; } ! if(displaytype == 'strict'){ ! var recordJson = StrandMap.getSelectedBenchmarkRecordJson(); ! var AAASCodeMod = getAAASCode(recordJson); ! var reqUrl = "bubble/resourcesStrict.jsp?bmId="+ id + "&startingOffset=" + offset + "&displaytype="+displaytype+"&AAASCodeMod="+AAASCodeMod; ! } else { ! <!--// get the map id //--> ! var referringMapId = StrandMap.getReferringMapId(); ! if(referringMapId != null){ ! var mapId = referringMapId; } else { ! var mapId = StrandMap.getMapId(); ! } ! <!-- // get the grades for this benchmark //--> ! var grArray = json.itemRecord.Data.GradeRanges.GradeRange; ! switch(grArray[0]) ! { ! case 'K': ! var grades = 'K'; ! break ! case '3': ! var grades = '3'; ! break ! case '6': ! var grades = '6'; ! break ! case '9': ! var grades = '9'; ! break ! default: + } + <!-- // get the keywords for this benchmark //--> + var kwArray = json.itemRecord.Data.Keywords.keyword; + var keywords = ''; + for(var i=0; i< kwArray.length; i++){ + if(i == 0){ + keywords += kwArray[i]; + } else if(i == kwArray.length-1){ + keywords += '|' + kwArray[i]; + } else { + keywords += '|' + kwArray[i]; } ! } + if(mapId == 'SMS-MAP-1496' || mapId == 'SMS-MAP-1504' || mapId == 'SMS-MAP-1478' || mapId == 'SMS-MAP-1487'){ var subjects = 'social studies'; *************** *** 384,392 **** if(subjects == ''){ if(subjArray.search(':')){ ! var testsubj = subjArray.substr(subjArray.indexOf(':')+1); ! subjects += testsubj.replace(/#|\//g,'|'); ! } else { ! subjects += subjArray.replace(/#|\//g,'|'); ! } } } --- 392,400 ---- if(subjects == ''){ if(subjArray.search(':')){ ! var testsubj = subjArray.substr(subjArray.indexOf(':')+1); ! subjects += testsubj.replace(/#|\//g,'|'); ! } else { ! subjects += subjArray.replace(/#|\//g,'|'); ! } } } *************** *** 419,423 **** } } ! } } --- 427,431 ---- } } ! } } *************** *** 425,431 **** } } ! ! var reqUrl = "bubble/resources.jsp?keywords="+ keywords+ "&grades="+grades+"&subjects="+ subjects + "&startingOffset="+offset+ "&stdKeywords="+stdKeywords + "&displaytype="+displaytype; } new Ajax.Request( reqUrl, --- 433,442 ---- } } ! if(gup('debug') != 1){ ! var reqUrl = "bubble/resources.jsp?keywords="+ keywords+ "&grades="+grades+"&subjects="+ subjects + "&startingOffset="+offset+ "&stdKeywords="+stdKeywords + "&displaytype="+displaytype+"&bmId="+id+"&mapId="+mapId; ! } else { ! var reqUrl = "bubble/resources.jsp?keywords="+ keywords+ "&grades="+grades+"&subjects="+ subjects + "&startingOffset="+offset+ "&stdKeywords="+stdKeywords + "&displaytype="+displaytype+"&debug=1&bmId="+id+"&mapId="+mapId; } + } new Ajax.Request( reqUrl, *************** *** 526,529 **** --- 537,541 ---- }); } + function checkStrand(jsonResponse){ getStrandKeywords(jsonResponse); *************** *** 545,548 **** --- 557,596 ---- } + + + // This tab illustrates how to access benchmark JSON and display it in the tab: + function myCallBackForBenchmarkInfoTab() { + var id = StrandMap.getSelectedBenchmarkId(); + var mapTitle = StrandMap.getMapJson().itemRecord.Data.Name; + var recordJson = StrandMap.getSelectedBenchmarkRecordJson(); + + var content = '<h1>Benchmark details</h1>'; + content += '<p>In map <i>' + mapTitle + '</i></p>'; + + content += '<p>Here is a small sample of the data that is available from the service about this benchmark:</p>'; + content += '<ul>'; + content += '<li><b>Benchmark name</b>: ' + recordJson.itemRecord.Data.Name + '</li>'; + content += '<li><b>Description</b>: ' + recordJson.itemRecord.Data.Description + '</li>'; + content += '<li><b>Benchmark SMS ID</b>: ' + id + '</li>'; + content += '<li><b>AAAS Code</b>: ' + recordJson.itemRecord.Data.AAASCode + '</li>'; + + var grArray = recordJson.itemRecord.Data.GradeRanges.GradeRange; + content += '<li><b>Grade range</b>: ' + grArray[0] + ' - ' + grArray[grArray.length-1] + '</li>'; + + var kwArray = recordJson.itemRecord.Data.Keywords.keyword; + content += '<li><b>Keywords</b>: '; + for(var i=0; i< kwArray.length; i++) + content += kwArray[i] + (i == kwArray.length-1 ? '</li>' : ', '); + + var relArray = recordJson.itemRecord.Data.InternalRelationship.CatalogID; + content += '<li><b>Internal relationships</b>:'; + for(var i=0; i< relArray.length; i++) + content += '<br/>- ' + relArray[i].RelationType + ' - ' + relArray[i].CatalogNumber; + content += '</li></ul>'; + benchmarkInfoTab.setContent(content); + } + + + // ----- Other JS for the NSDL client page: *************** *** 574,576 **** isHelpDown = !isHelpDown; } ! \ No newline at end of file --- 622,635 ---- isHelpDown = !isHelpDown; } ! ! function gup( name ) ! { ! name = name.replace(/[\[]/,"\\\[").replace(/[\]]/,"\\\]"); ! var regexS = "[\\?&]"+name+"=([^&#]*)"; ! var regex = new RegExp( regexS ); ! var results = regex.exec( window.location.href ); ! if( results == null ) ! return ""; ! else ! return results[1]; ! } \ No newline at end of file |
|
From: S C. <sl...@us...> - 2008-06-23 19:16:49
|
Update of /cvsroot/strandmapservic/nsdl-client-project/web/bubble In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv7837/web/bubble Modified Files: resourcesStrict.jsp resources.jsp Log Message: debug=1 parameter in url provides link to results xml and tab with bm info Index: resources.jsp =================================================================== RCS file: /cvsroot/strandmapservic/nsdl-client-project/web/bubble/resources.jsp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** resources.jsp 29 Feb 2008 23:29:06 -0000 1.7 --- resources.jsp 23 Jun 2008 19:16:46 -0000 1.8 *************** *** 1,5 **** <%@ include file="../../TagLibIncludes.jsp" %> ! <h2>NSDL Resources</h2> ! <%-- Grab the required service URLs (defined in web.xml or server.xml): --%> <c:set var="smsCsipBaseUrl" value="${initParam.smsCsipBaseUrl}" /> --- 1,4 ---- <%@ include file="../../TagLibIncludes.jsp" %> ! <p>These resources were selected by performing a keyword search over items in the NSDL library.</p> <%-- Grab the required service URLs (defined in web.xml or server.xml): --%> <c:set var="smsCsipBaseUrl" value="${initParam.smsCsipBaseUrl}" /> *************** *** 9,12 **** --- 8,12 ---- String startingOffset = request.getParameter("startingOffset"); String map = request.getParameter("mapId"); + String bm = request.getParameter("bmId"); String stdKeywords = request.getParameter("stdKeywords"); String subjects = request.getParameter("subjects"); *************** *** 14,17 **** --- 14,18 ---- String keywords = request.getParameter("keywords"); String displaytype = request.getParameter("displaytype"); + String debug = request.getParameter("debug"); %> *************** *** 20,27 **** --- 21,30 ---- <c:set var="stdKeywords" value="<%=stdKeywords%>"/> <c:set var="map" value="<%=map%>"/> + <c:set var="bm" value="<%=bm%>"/> <c:set var="subj" value="<%=subjects%>"/> <c:set var="grades" value="<%=grades%>"/> <c:set var="kw" value="<%=keywords%>"/> <c:set var="displaytype" value="<%=displaytype%>"/> + <c:set var="debug" value="<%=debug%>"/> <c:set var="strandkeywords" value=""/> *************** *** 124,128 **** <c:param name="q" value="${query}"/> </c:url> ! <%-- Issue the request to the Web service server and store the response in variable 'xmlResponse' --%> <c:import url="${webServiceRequest}" var="xmlResponse" charEncoding="UTF-8" /> --- 127,133 ---- <c:param name="q" value="${query}"/> </c:url> ! <c:if test="${debug == '1'}"> ! <p><a href="${webServiceRequest}" target="_blank">View Results XML</a></p> ! </c:if> <%-- Issue the request to the Web service server and store the response in variable 'xmlResponse' --%> <c:import url="${webServiceRequest}" var="xmlResponse" charEncoding="UTF-8" /> *************** *** 249,252 **** --- 254,262 ---- <x:out select="fields/compoundDescription"/> </c:set> + + <c:set var="audience"> + <x:out select="fields/compoundAudience"/> + </c:set> + <p class="resource, stdlink" id="resourceItem"> <div class="resourceTitle"> *************** *** 294,297 **** --- 304,314 ---- </c:if> ${description} + <a href="http://localhost:8080/search/?q=&verb=Search&s=0&n=10&item_num=0&identifier=${resourceURL}&bm=${bm}&id=${map}&debug=${debug}">View More</a> + + <c:if test="${debug == '1'}"> + <c:set var="audienceLists" value="${fn:replace( audience, ' ~^',', ')}"/> + <br/><strong>Audiences:</strong> + <c:out value="${audienceLists}" /> + </c:if> </div> </p> Index: resourcesStrict.jsp =================================================================== RCS file: /cvsroot/strandmapservic/nsdl-client-project/web/bubble/resourcesStrict.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** resourcesStrict.jsp 16 May 2008 21:57:13 -0000 1.2 --- resourcesStrict.jsp 23 Jun 2008 19:16:46 -0000 1.3 *************** *** 58,62 **** <%-- If the total number of results is greater than zero, display them --%> <x:when select="$xmlDom/NSDLSearchService/SearchResults/resultsInfo/totalNumResults > 0"> ! <h2>NSDL Resources</h2> <%-- ------ Begin paging logic ------ --%> <%-- Save the number of results in variable 'numResults' --%> --- 58,62 ---- <%-- If the total number of results is greater than zero, display them --%> <x:when select="$xmlDom/NSDLSearchService/SearchResults/resultsInfo/totalNumResults > 0"> ! <p>These resources were hand-aligned to this benchmark.</p> <%-- ------ Begin paging logic ------ --%> <%-- Save the number of results in variable 'numResults' --%> |
|
From: John W. <jwe...@us...> - 2008-06-13 22:38:33
|
Update of /cvsroot/strandmapservic/smsServer/WEB-INF In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv28974/WEB-INF Modified Files: Copyright.txt Log Message: updated copyright statement, added project name, clarified attribution Index: Copyright.txt =================================================================== RCS file: /cvsroot/strandmapservic/smsServer/WEB-INF/Copyright.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Copyright.txt 12 Nov 2007 22:36:49 -0000 1.3 --- Copyright.txt 13 Jun 2008 22:38:29 -0000 1.4 *************** *** 1,20 **** ! Copyright 2002-2005 Boulder Learning Technologies Lab & American Association for the Advancement of Science, ! DLC-1B20, Department of Computer Science, University of Colorado at Boulder, ! CO-80309, Tel: 303-492-0916, email: fa...@co... ! This file is part of the Concept Map Service Software Project. ! The Concept Map Service Project is free software; you can redistribute it and/or ! modify it under the terms of the GNU General Public License as ! published by the Free Software Foundation; either version 2 of the ! License, or (at your option) any later version. ! The Concept Map Service OAI Project is distributed in the hope that it will be ! useful, but WITHOUT ANY WARRANTY; without even the implied warranty of ! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ! General Public License for more details. ! You should have received a copy of the GNU General Public License ! along with The Concept Map Service System; if not, write to the Free Software ! Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 ! USA \ No newline at end of file --- 1,24 ---- ! Copyright 2002-2008 Digital Learning Sciences (DLS), University Corporation for Atmospheric Research (UCAR), ! P.O. Box 3000, Boulder, CO 80307 and the Institute of Cognitive Science, University of Colorado at Boulder. ! The Benchmarks for Science Literacy and all other AAAS content copyright ! American Association for the Advancement of Science, all rights reserved. ! This file is part of the Strand Map Service Software Project. ! When using, modifying or redistributing this software, include the following acknowledgment: ! "This product includes software developed by Digital Learning Sciences (DLS) (www.dlsciences.org) ! at the University Corporation for Atmospheric Research." ! ! This software is free software; you can redistribute it and/or modify it ! under the terms of the GNU General Public License as published by the Free Software ! Foundation; Version 2 of the License. ! ! This software is distributed in the hope that it will be useful, but ! WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS ! FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. ! ! You should have received a copy of the GNU General Public License along with ! this software; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite ! 330, Boston, MA 02111-1307 USA \ No newline at end of file |
|
From: S C. <sl...@us...> - 2008-05-16 21:57:19
|
Update of /cvsroot/strandmapservic/nsdl-client-project/web/bubble In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv18946/web/bubble Modified Files: recommenderProcessor.jsp resourcesStrict.jsp Log Message: submit suggested resources using AAAS code. Add a tab that only shows aligned resources. If resources are aligned, default to new tab. Index: recommenderProcessor.jsp =================================================================== RCS file: /cvsroot/strandmapservic/nsdl-client-project/web/bubble/recommenderProcessor.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** recommenderProcessor.jsp 18 Apr 2008 21:43:25 -0000 1.2 --- recommenderProcessor.jsp 16 May 2008 21:57:13 -0000 1.3 *************** *** 11,14 **** --- 11,15 ---- String audience = request.getParameter("audience"); String resourceType = request.getParameter("resourceType"); + String AAASCode = request.getParameter("AAASCode"); String asnID = request.getParameter("asnID"); %> *************** *** 23,26 **** --- 24,28 ---- <c:set var="audience" value="<%=audience%>"/> <c:set var="resourcetype" value="<%=resourceType%>"/> + <c:set var="AAASCode" value="<%=AAASCode%>"/> <c:set var="asnID" value="<%=asnID%>"/> <c:set var="baseUrl" value="http://ncs.nsdl.org/mgr/services/recommend.do" /> *************** *** 70,74 **** ${asnId} ${standards} ! <otherStandard>${bmID}</otherStandard> </standards> <audiences> --- 72,76 ---- ${asnId} ${standards} ! <otherStandard>${AAASCode}</otherStandard> </standards> <audiences> Index: resourcesStrict.jsp =================================================================== RCS file: /cvsroot/strandmapservic/nsdl-client-project/web/bubble/resourcesStrict.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** resourcesStrict.jsp 18 Apr 2008 21:43:25 -0000 1.1 --- resourcesStrict.jsp 16 May 2008 21:57:13 -0000 1.2 *************** *** 9,14 **** String startingOffset = request.getParameter("startingOffset"); String bmId = request.getParameter("bmId"); ! String AAASCode = request.getParameter("AAASCode"); ! String subAAASCode = request.getParameter("subAAASCode"); String displaytype = request.getParameter("displaytype"); %> --- 9,13 ---- String startingOffset = request.getParameter("startingOffset"); String bmId = request.getParameter("bmId"); ! String AAASCodeMod = request.getParameter("AAASCodeMod"); String displaytype = request.getParameter("displaytype"); %> *************** *** 16,26 **** <c:set var="startingOffset" value="<%=startingOffset%>"/> <c:set var="bmId" value="<%=bmId%>"/> ! <c:set var="subAAASCode" value="<%=subAAASCode%>"/> ! <c:set var="AAASCode" value="<%=AAASCode%>"/> <c:set var="displaytype" value="<%=displaytype%>"/> ! ! <c:set var="query" value='dct\:conformsTo:("${bmId}" OR "*${AAASCode}*" OR "*${subAAASCode}*")'/> ! <%-- The maximum character length of the description that gets displayed in the initial search results. --- 15,22 ---- <c:set var="startingOffset" value="<%=startingOffset%>"/> <c:set var="bmId" value="<%=bmId%>"/> ! <c:set var="AAASCodeMod" value="<%=AAASCodeMod%>"/> <c:set var="displaytype" value="<%=displaytype%>"/> ! <c:set var="query" value='dct\:conformsTo:("${bmId}" OR (("AAAS") AND ("${AAASCodeMod}")))'/> <%-- The maximum character length of the description that gets displayed in the initial search results. |
|
From: S C. <sl...@us...> - 2008-05-16 21:57:18
|
Update of /cvsroot/strandmapservic/nsdl-client-project/web/js In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv18946/web/js Modified Files: nsdlclientsms.js Log Message: submit suggested resources using AAAS code. Add a tab that only shows aligned resources. If resources are aligned, default to new tab. Index: nsdlclientsms.js =================================================================== RCS file: /cvsroot/strandmapservic/nsdl-client-project/web/js/nsdlclientsms.js,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** nsdlclientsms.js 18 Apr 2008 21:43:25 -0000 1.7 --- nsdlclientsms.js 16 May 2008 21:57:13 -0000 1.8 *************** *** 17,22 **** SMSEvent.addListener(StrandMap,"onprintviewdisplay",onPrintViewDisplay); // Create the 'Resources' tab and set it's handler: ! resourcesTab = new InfoBubbleTab('Resources'); infoBubble.addTab(resourcesTab); SMSEvent.addListener(StrandMap,"onbenchmarkselect",resourcesTabCallback); --- 17,27 ---- SMSEvent.addListener(StrandMap,"onprintviewdisplay",onPrintViewDisplay); + // Create the aligned 'Resources' tab and set it's handler: + resourcesStrictTab = new InfoBubbleTab('Resources'); + infoBubble.addTab(resourcesStrictTab); + SMSEvent.addListener(StrandMap,"onbenchmarkselect",resourcesStrictTabCallback); + // Create the 'Resources' tab and set it's handler: ! resourcesTab = new InfoBubbleTab('Search Results'); infoBubble.addTab(resourcesTab); SMSEvent.addListener(StrandMap,"onbenchmarkselect",resourcesTabCallback); *************** *** 24,28 **** // Use the built-in tabs for displaying related benchmarks and nses standards: infoBubble.addBuiltinTab("nses","NSES Standards"); ! infoBubble.addBuiltinTab("relatedbenchmarks","Related benchmarks"); // When a benchmark is selected by the user, make sure the resourcesTab is displayed: --- 29,33 ---- // Use the built-in tabs for displaying related benchmarks and nses standards: infoBubble.addBuiltinTab("nses","NSES Standards"); ! infoBubble.addBuiltinTab("relatedbenchmarks","Related Benchmarks"); // When a benchmark is selected by the user, make sure the resourcesTab is displayed: *************** *** 51,55 **** numberOfStrands = 0; resourcesTab.setContent('Loading...'); ! getResources('strict'); } function recommendTabCallback() { --- 56,67 ---- numberOfStrands = 0; resourcesTab.setContent('Loading...'); ! getResources(''); ! } ! function resourcesStrictTabCallback(){ ! stdKeywords = ''; ! currentStrandCount = 0; ! numberOfStrands = 0; ! resourcesStrictTab.setContent('Loading...'); ! getResources('strict'); } function recommendTabCallback() { *************** *** 135,141 **** var grdloc = AAASCode.search(re); var newCode = AAASCode.substring(0,grdloc-1)+ '.' + AAASCode.substring(grdloc-1); ! var subCode = 'AAAS Benchmark ' + newCode.replace(re,'.'); ! ! return subCode; } --- 147,157 ---- var grdloc = AAASCode.search(re); var newCode = AAASCode.substring(0,grdloc-1)+ '.' + AAASCode.substring(grdloc-1); ! var subCode = newCode.replace(re,'.'); ! ! var re2 = new RegExp('a?b?$'); ! var paraloc = subCode.search(re2); ! var lastCode = subCode.substring(0,paraloc); ! ! return lastCode; } *************** *** 169,172 **** --- 185,189 ---- var resDescription = document.getElementById('description').value; var resAudience = document.getElementById('audience').value; + var AAASCode = "AAAS Benchmarks " + getAAASCode(recordJson); var asnID = '<asnID></asnID>'; // for now asnID var is not included in url; *************** *** 180,184 **** } ! var reqUrl = "bubble/recommenderProcessor.jsp?url="+ resUrl+ "&title="+resTitle+"&description="+ resDescription + "&id="+bmID + "&grades="+grades + "&stds=" + resStandards + "&subjects=" + subjects + "&audience=" + resAudience + "&asnID="; new Ajax.Request( --- 197,201 ---- } ! var reqUrl = "bubble/recommenderProcessor.jsp?url="+ resUrl+ "&title="+resTitle+"&description="+ resDescription + "&id="+bmID + "&grades="+grades + "&stds=" + resStandards + "&subjects=" + subjects + "&AAASCode=" + AAASCode + "&audience=" + resAudience + "&asnID="; new Ajax.Request( *************** *** 200,203 **** --- 217,222 ---- function processResponse(resourceID, resUrl, resTitle, resDescription, bmID, grades, resStandards, subjects, bmID, resAudience){ // check for confirm id, then send data via email + + var mailUrl = "bubble/mail.jsp?resourceID=" + resourceID + "&url="+ resUrl+ "&title="+resTitle+"&description="+ resDescription + "&id="+bmID + "&grades="+grades + "&stds=" + resStandards + "&subjects=" + subjects + "&bmID=" + bmID +"&audience=" + resAudience; new Ajax.Request( *************** *** 310,321 **** if(displaytype == 'strict'){ var recordJson = StrandMap.getSelectedBenchmarkRecordJson(); ! var AAASCode = recordJson.itemRecord.Data.AAASCode; ! var re = new RegExp('/[A-Z]*'); ! ! var grdloc = AAASCode.search(re); ! var newCode = AAASCode.substring(0,grdloc-1)+ '.' + AAASCode.substring(grdloc-1); ! var subCode = newCode.replace(re,'.'); var id = StrandMap.getSelectedBenchmarkId(); ! var reqUrl = "bubble/resourcesStrict.jsp?bmId="+ id + "&startingOffset=" + offset + "&displaytype="+displaytype+"&AAASCode="+AAASCode+"&subAAASCode="+subCode; } else { --- 329,335 ---- if(displaytype == 'strict'){ var recordJson = StrandMap.getSelectedBenchmarkRecordJson(); ! var AAASCodeMod = getAAASCode(recordJson); var id = StrandMap.getSelectedBenchmarkId(); ! var reqUrl = "bubble/resourcesStrict.jsp?bmId="+ id + "&startingOffset=" + offset + "&displaytype="+displaytype+"&AAASCodeMod="+AAASCodeMod; } else { *************** *** 505,511 **** var contentCheck = content.search(re); if(contentCheck > -1){ ! resourcesTab.setContent(content); } else { ! getResources(''); } }); --- 519,526 ---- var contentCheck = content.search(re); if(contentCheck > -1){ ! resourcesStrictTab.setContent(content); ! infoBubble.selectTab(resourcesStrictTab); } else { ! resourcesStrictTab.setContent('<p>There are no hand-aligned resources for this benchmark. Please look at the Search Results tab for possible relevant resources in the NSDL.</p>'); } }); |
|
From: S C. <sl...@us...> - 2008-05-16 21:56:27
|
Update of /cvsroot/strandmapservic/smsServer/jsapi/api_v1/interactive_map In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv18897/jsapi/api_v1/interactive_map Modified Files: strand_map_public_js_api.js Log Message: incl AAAS code in statement Index: strand_map_public_js_api.js =================================================================== RCS file: /cvsroot/strandmapservic/smsServer/jsapi/api_v1/interactive_map/strand_map_public_js_api.js,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** strand_map_public_js_api.js 14 Nov 2007 17:42:43 -0000 1.4 --- strand_map_public_js_api.js 16 May 2008 21:56:20 -0000 1.5 *************** *** 222,225 **** --- 222,226 ---- var mainContent = '<div style="margin-bottom:10;padding-top:6;">'; mainContent += bmJson.itemRecord.Data.Description; + mainContent += ' <em>' + bmJson.itemRecord.Data.AAASCode + '</em>'; mainContent += '<div style="padding-top:8"><em>Grade range</em>: '; var grArray = bmJson.itemRecord.Data.GradeRanges.GradeRange; *************** *** 241,244 **** --- 242,246 ---- var mainContent = '<div style="margin-bottom:10;padding-top:6;">'; mainContent += bmJson.itemRecord.Data.Description; + mainContent += ' <em>' + bmJson.itemRecord.Data.AAASCode + '</em>'; mainContent += '<div style="padding-top:8"><em>Grade range</em>: '; var grArray = bmJson.itemRecord.Data.GradeRanges.GradeRange; |
|
From: John W. <jwe...@us...> - 2008-05-02 14:51:46
|
Update of /cvsroot/strandmapservic/smsServer/docs/jsapi/api_v1/example_clients/example4 In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv23475/docs/jsapi/api_v1/example_clients/example4 Modified Files: index.html Log Message: -Added AAAS code display, white background on TOC Index: index.html =================================================================== RCS file: /cvsroot/strandmapservic/smsServer/docs/jsapi/api_v1/example_clients/example4/index.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** index.html 12 Nov 2007 22:39:33 -0000 1.2 --- index.html 2 May 2008 14:51:40 -0000 1.3 *************** *** 193,205 **** body, #navigatorPane { background: #E9EFAA; - } - - .mapTable { - border-color: #E9EFAA; - } - - .mapTableOver { - border-color: #ACAF83; - background: #DBDFA7; } --- 193,196 ---- *************** *** 265,270 **** --- 256,282 ---- padding-left:5; } + + + /* The table of contents - map list */ + .mapTable { + border-color: white; + } + .mapTableOver { + border-color: #B3BFB3; + background: #E0EFE0; + } + #mapList, #defaultContent { + margin-top:0; + border: solid 1px #888888; + background-color: white; + margin-bottom: 30px; + } #defaultContent { padding:20px; + padding-top:0px; + } + p { + padding-top: 15px; + margin: 0px; } </style> |
|
From: John W. <jwe...@us...> - 2008-05-02 14:51:46
|
Update of /cvsroot/strandmapservic/smsServer/docs/jsapi/api_v1/example_clients In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv23475/docs/jsapi/api_v1/example_clients Modified Files: sms_example3.html Log Message: -Added AAAS code display, white background on TOC Index: sms_example3.html =================================================================== RCS file: /cvsroot/strandmapservic/smsServer/docs/jsapi/api_v1/example_clients/sms_example3.html,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** sms_example3.html 14 Nov 2007 00:33:11 -0000 1.3 --- sms_example3.html 2 May 2008 14:51:40 -0000 1.4 *************** *** 69,73 **** content += '<li><b>Benchmark name</b>: ' + recordJson.itemRecord.Data.Name + '</li>'; content += '<li><b>Description</b>: ' + recordJson.itemRecord.Data.Description + '</li>'; ! content += '<li><b>Benchmark ID</b>: ' + id + '</li>'; var grArray = recordJson.itemRecord.Data.GradeRanges.GradeRange; --- 69,74 ---- content += '<li><b>Benchmark name</b>: ' + recordJson.itemRecord.Data.Name + '</li>'; content += '<li><b>Description</b>: ' + recordJson.itemRecord.Data.Description + '</li>'; ! content += '<li><b>Benchmark SMS ID</b>: ' + id + '</li>'; ! content += '<li><b>AAAS Code</b>: ' + recordJson.itemRecord.Data.AAASCode + '</li>'; var grArray = recordJson.itemRecord.Data.GradeRanges.GradeRange; *************** *** 166,179 **** body, #navigatorPane { background: #E9EFAA; ! } ! ! .mapTable { ! border-color: #E9EFAA; ! } ! ! .mapTableOver { ! border-color: #ACAF83; ! background: #DBDFA7; ! } body, p, h1, h2, h3, h4, td, li { font-family: Geneva, Arial, Helvetica, sans-serif; } --- 167,171 ---- body, #navigatorPane { background: #E9EFAA; ! } body, p, h1, h2, h3, h4, td, li { font-family: Geneva, Arial, Helvetica, sans-serif; } *************** *** 210,215 **** --- 202,228 ---- font-size: 18px; } + + + /* The table of contents - map list */ + .mapTable { + border-color: white; + } + .mapTableOver { + border-color: #B3BFB3; + background: #E0EFE0; + } + #mapList, #defaultContent { + margin-top:0; + border: solid 1px #888888; + background-color: white; + margin-bottom: 30px; + } #defaultContent { padding:20px; + padding-top:0px; + } + p { + padding-top: 15px; + margin: 0px; } |
|
From: John W. <jwe...@us...> - 2008-05-01 21:49:20
|
Update of /cvsroot/strandmapservic/smsServer/WEB-INF/Database In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv14586/WEB-INF/Database Modified Files: strandmap.sql Log Message: -latest QA changes from Mike Index: strandmap.sql =================================================================== RCS file: /cvsroot/strandmapservic/smsServer/WEB-INF/Database/strandmap.sql,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** strandmap.sql 11 Mar 2008 22:37:00 -0000 1.3 --- strandmap.sql 1 May 2008 21:49:11 -0000 1.4 *************** *** 1,17405 **** ! DROP TABLE IF EXISTS `objects`; ! CREATE TABLE objects (`ExternalResources` longtext NULL,`Standards` longtext NULL,`object_type` varchar (255) NOT NULL ,`object_ID` varchar (255) NOT NULL ,`Name` text NOT NULL ,`source` varchar (255) NULL,`primary_grade` varchar (255) NULL,`second_grade` varchar (255) NULL,`record_status` varchar (255) NULL,`full_text` text NULL,`description` text NULL,`subjects` varchar (255) NULL,`keywords` text NULL,`metadata_code` varchar (255) NULL,`metadata_lan` varchar (255) NULL,`date_created` date NULL,`clarification` longtext NULL,`student_conceptions` longtext NULL,`examples` longtext NULL,`assessments` longtext NULL,`instructional_information` longtext NULL,`serial` varchar (255) NULL,`aaas_code` varchar (255) NULL,`code_plus` varchar (255) NULL, PRIMARY KEY (object_ID)); ! DROP TABLE IF EXISTS `registeredqueries`; ! CREATE TABLE registeredqueries (`PublishedName` varchar (255) NOT NULL ,`QueryHost` longtext NULL,`QueryString` longtext NOT NULL ,`AuthenticationCode` varchar (255) NULL,`Encoding` enum ('UTF-8','ASCII','Cp1252','ISO8859_1','UnicodeBig','UnicodeBigUnmarked','UnicodeLittle','UnicodeLittleUnmarked','UTF8','UTF-16','MIN-URL','None') NOT NULL ,`Status` enum ('Enable','Disable') NOT NULL ,`ObjectName` varchar (100) NOT NULL , PRIMARY KEY (ObjectName, PublishedName)); ! DROP TABLE IF EXISTS `relation`; ! CREATE TABLE relation (`ItemID1` varchar (255) NOT NULL ,`ItemID2` varchar (255) NOT NULL ,`RelationType` varchar (255) NOT NULL , PRIMARY KEY (ItemID1, ItemID2)); ! DROP TABLE IF EXISTS `strandpos`; ! CREATE TABLE strandpos (`object_ID` varchar (100) NOT NULL ,`Pos` varchar (100) NOT NULL , PRIMARY KEY (object_ID)); ! ! LOCK TABLES `objects` WRITE; [...17517 lines suppressed...] ! -- ! -- Dumping data for table `strandpos` ! -- LOCK TABLES `strandpos` WRITE; ! /*!40000 ALTER TABLE `strandpos` DISABLE KEYS */; ! INSERT INTO `strandpos` VALUES ('','1'),('SMS-STD-0036','1'),('SMS-STD-0037','2'),('SMS-STD-0038','3'),('SMS-STD-0039','4'),('SMS-STD-0040','1'),('SMS-STD-0041','2'),('SMS-STD-0055','3'),('SMS-STD-1201','1'),('SMS-STD-1202','2'),('SMS-STD-1208','1'),('SMS-STD-1209','2'),('SMS-STD-1210','3'),('SMS-STD-1211','4'),('SMS-STD-1217','1'),('SMS-STD-1218','2'),('SMS-STD-1219','3'),('SMS-STD-1225','1'),('SMS-STD-1226','2'),('SMS-STD-1227','3'),('SMS-STD-1233','1'),('SMS-STD-1234','2'),('SMS-STD-1235','3'),('SMS-STD-1241','1'),('SMS-STD-1242','2'),('SMS-STD-1243','3'),('SMS-STD-1244','4'),('SMS-STD-1250','1'),('SMS-STD-1251','2'),('SMS-STD-1252','3'),('SMS-STD-1258','1'),('SMS-STD-1259','2'),('SMS-STD-1260','3'),('SMS-STD-1266','1'),('SMS-STD-1267','2'),('SMS-STD-1268','3'),('SMS-STD-1274','1'),('SMS-STD-1275','2'),('SMS-STD-1276','3'),('SMS-STD-1277','4'),('SMS-STD-1283','1'),('SMS-STD-1284','2'),('SMS-STD-1285','3'),('SMS-STD-1286','4'),('SMS-STD-1287','5'),('SMS-STD-1294','2'),('SMS-STD-1295','3'),('SMS-STD-1301','1'),('SMS-STD-1302','2'),('SMS-STD-1303','3'),('SMS-STD-1326','1'),('SMS-STD-1327','2'),('SMS-STD-1333','3'),('SMS-STD-1334','1'),('SMS-STD-1335','2'),('SMS-STD-1336','4'),('SMS-STD-1342','1'),('SMS-STD-1343','2'),('SMS-STD-1344','3'),('SMS-STD-1350','1'),('SMS-STD-1351','2'),('SMS-STD-1352','3'),('SMS-STD-1359','2'),('SMS-STD-1365','3'),('SMS-STD-1366','2'),('SMS-STD-1367','1'),('SMS-STD-1373','1'),('SMS-STD-1374','2'),('SMS-STD-1375','3'),('SMS-STD-1376','4'),('SMS-STD-1382','1'),('SMS-STD-1383','2'),('SMS-STD-1384','3'),('SMS-STD-1390','1'),('SMS-STD-1391','2'),('SMS-STD-1392','3'),('SMS-STD-1398','1'),('SMS-STD-1399','2'),('SMS-STD-1400','3'),('SMS-STD-1406','1'),('SMS-STD-1407','2'),('SMS-STD-1408','3'),('SMS-STD-1409','4'),('SMS-STD-1423','1'),('SMS-STD-1424','2'),('SMS-STD-1425','3'),('SMS-STD-1431','1'),('SMS-STD-1432','2'),('SMS-STD-1438','1'),('SMS-STD-1439','2'),('SMS-STD-1440','3'),('SMS-STD-1441','4'),('SMS-STD-1447','1'),('SMS-STD-1448','2'),('SMS-STD-1449','3'),('SMS-STD-1455','1'),('SMS-STD-1456','2'),('SMS-STD-1457','3'),('SMS-STD-1463','1'),('SMS-STD-1464','2'),('SMS-STD-1465','3'),('SMS-STD-1471','1'),('SMS-STD-1472','2'),('SMS-STD-1473','3'),('SMS-STD-1479','1'),('SMS-STD-1480','2'),('SMS-STD-1481','3'),('SMS-STD-1482','4'),('SMS-STD-1488','1'),('SMS-STD-1489','2'),('SMS-STD-1490','3'),('SMS-STD-1491','4'),('SMS-STD-1497','1'),('SMS-STD-1498','2'),('SMS-STD-1499','3'),('SMS-STD-1505','1'),('SMS-STD-1506','2'),('SMS-STD-1507','3'),('SMS-STD-1508','4'),('SMS-STD-1514','1'),('SMS-STD-1515','2'),('SMS-STD-1516','3'),('SMS-STD-1517','4'),('SMS-STD-1523','1'),('SMS-STD-1524','2'),('SMS-STD-1525','3'),('SMS-STD-1531','3'),('SMS-STD-1532','2'),('SMS-STD-1533','1'),('SMS-STD-1539','1'),('SMS-STD-1540','3'),('SMS-STD-1541','2'),('SMS-STD-1542','4'),('SMS-STD-1548','1'),('SMS-STD-1549','2'),('SMS-STD-1550','3'),('SMS-STD-1556','1'),('SMS-STD-1557','2'),('SMS-STD-1558','3'),('SMS-STD-1564','1'),('SMS-STD-1565','2'),('SMS-STD-1566','3'),('SMS-STD-1572','1'),('SMS-STD-1573','2'),('SMS-STD-1574','3'),('SMS-STD-1580','1'),('SMS-STD-1581','2'),('SMS-STD-1587','1'),('SMS-STD-1588','2'),('SMS-STD-1589','3'),('SMS-STD-1595','1'),('SMS-STD-1596','2'),('SMS-STD-1597','3'),('SMS-STD-1598','4'),('SMS-STD-1605','3'),('SMS-STD-1606','2'),('SMS-STD-1607','1'),('SMS-STD-1612','1'),('SMS-STD-1613','2'),('SMS-STD-1614','3'),('SMS-STD-1616','1'),('SMS-STD-1617','2'),('SMS-STD-1618','3'),('SMS-STD-1619','4'),('SMS-STD-1629','1'),('SMS-STD-1630','2'),('SMS-STD-1631','3'),('SMS-STD-1637','1'),('SMS-STD-1638','2'),('SMS-STD-1639','3'),('SMS-STD-1640','4'),('SMS-STD-1647','2'),('SMS-STD-1648','3'),('SMS-STD-1663','1'),('SMS-STD-1664','2'),('SMS-STD-1665','3'),('SMS-STD-1687','1'),('SMS-STD-1688','2'),('SMS-STD-2033','1'),('SMS-STD-2034','2'),('SMS-STD-2035','3'),('SMS-STD-2036','4'),('SMS-STD-2056','1'),('SMS-STD-2057','2'),('SMS-STD-2058','3'),('SMS-STD-2059','4'),('SMS-STD-2072','1'),('SMS-STD-2073','2'),('SMS-STD-2074','3'),('SMS-STD-2086','1'),('SMS-STD-2087','2'),('SMS-STD-2088','3'),('SMS-STD-2089','4'),('SMS-STD-2106','1'),('SMS-STD-2107','2'),('SMS-STD-2108','3'),('SMS-STD-2123','1'),('SMS-STD-2124','2'),('SMS-STD-2125','3'),('SMS-STD-2126','4'),('SMS-STD-2137','1'),('SMS-STD-2138','2'),('SMS-STD-2139','3'),('SMS-STD-2140','4'),('SMS-STD-2156','1'),('SMS-STD-2157','2'),('SMS-STD-2158','3'),('SMS-STD-2159','4'),('SMS-STD-2173','1'),('SMS-STD-2174','2'),('SMS-STD-2175','3'),('SMS-STD-2176','4'),('SMS-STD-2186','1'),('SMS-STD-2187','2'),('SMS-STD-2197','1'),('SMS-STD-2198','2'),('SMS-STD-2215','1'),('SMS-STD-2216','2'),('SMS-STD-2232','1'),('SMS-STD-2233','2'),('SMS-STD-2234','3'),('SMS-STD-2247','1'),('SMS-STD-2248','2'),('SMS-STD-2249','3'),('SMS-STD-2265','1'),('SMS-STD-2266','2'),('SMS-STD-2283','1'),('SMS-STD-2284','2'),('SMS-STD-2301','1'),('SMS-STD-2302','2'),('SMS-STD-2303','3'),('SMS-STD-2304','4'),('SMS-STD-2313','1'),('SMS-STD-2314','2'),('SMS-STD-2324','1'),('SMS-STD-2325','2'),('SMS-STD-2331','1'),('SMS-STD-2332','2'),('SMS-STD-2335','3'),('SMS-STD-2341','1'),('SMS-STD-2342','2'),('SMS-STD-2343','3'),('SMS-STD-2356','1'),('SMS-STD-2357','2'),('SMS-STD-2358','3'),('SMS-STD-2359','4'),('SMS-STD-2380','1'),('SMS-STD-2381','2'),('SMS-STD-2391','1'),('SMS-STD-2402','1'),('SMS-STD-2403','3'),('SMS-STD-2409','1'),('SMS-STD-2410','2'),('SMS-STD-2425','1'),('SMS-STD-2426','2'),('SMS-STD-2437','1'),('SMS-STD-2438','2'),('SMS-STD-2439','3'),('SMS-STD-2440','4'),('SMS-STD-2459','1'),('SMS-STD-2460','2'),('SMS-STD-2461','3'),('SMS-STD-2470','1'),('SMS-STD-2471','2'),('SMS-STD-2482','1'),('SMS-STD-2483','2'),('SMS-STD-2484','3'),('SMS-STD-2491','1'),('SMS-STD-2492','2'),('SMS-STD-2508','1'),('SMS-STD-2509','2'),('SMS-STD-2510','3'),('SMS-STD-2515','1'),('SMS-STD-2516','2'),('SMS-STD-2517','3'),('SMS-STD-2518','3'),('SMS-STD-2519','4'),('SMS-STD-2520','2'),('SMS-STD-2521','2'),('SMS-STD-2522','1'),('SMS-STD-2523','3'),('SMS-STD-2532','1'),('SMS-STD-2533','2'),('SMS-STD-2534','3'),('SMS-STD-2562','1'),('SMS-STD-2563','2'),('SMS-STD-2564','3'),('SMS-STD-2565','4'),('SMS-STD-9002','1'),('SMS-STD-9003','2'),('SMS-STD-9004','3'),('SMS-STD-9031','1'),('SMS-STD-9032','2'),('SMS-STD-9033','3'),('SMS-STD-9034','4'); ! /*!40000 ALTER TABLE `strandpos` ENABLE KEYS */; UNLOCK TABLES; + /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; + + /*!40101 SET SQL_MODE=@OLD_SQL_MODE */; + /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; + /*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; + /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; + /*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; + /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; + /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; + + -- Dump completed on 2008-05-01 21:40:59 |
|
From: S C. <sl...@us...> - 2008-04-18 21:43:31
|
Update of /cvsroot/strandmapservic/nsdl-client-project/web/js In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv14982/web/js Modified Files: nsdlclientsms.js Log Message: code updates to only submit SMS-BMK id for recommendations. Search checks some variations of benchmark alignment before performing full search. Index: nsdlclientsms.js =================================================================== RCS file: /cvsroot/strandmapservic/nsdl-client-project/web/js/nsdlclientsms.js,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** nsdlclientsms.js 5 Mar 2008 17:17:09 -0000 1.6 --- nsdlclientsms.js 18 Apr 2008 21:43:25 -0000 1.7 *************** *** 51,55 **** numberOfStrands = 0; resourcesTab.setContent('Loading...'); ! getResources(''); } function recommendTabCallback() { --- 51,55 ---- numberOfStrands = 0; resourcesTab.setContent('Loading...'); ! getResources('strict'); } function recommendTabCallback() { *************** *** 133,137 **** var AAASCode = bmJson.itemRecord.Data.AAASCode; var re = new RegExp('/[A-Z]*'); ! var subCode = 'AAAS Benchmark ' + AAASCode.replace(re,'.').toLowerCase(); return subCode; --- 133,139 ---- var AAASCode = bmJson.itemRecord.Data.AAASCode; var re = new RegExp('/[A-Z]*'); ! var grdloc = AAASCode.search(re); ! var newCode = AAASCode.substring(0,grdloc-1)+ '.' + AAASCode.substring(grdloc-1); ! var subCode = 'AAAS Benchmark ' + newCode.replace(re,'.'); return subCode; *************** *** 167,171 **** var resDescription = document.getElementById('description').value; var resAudience = document.getElementById('audience').value; - var resAAASCode = getAAASCode(recordJson); var asnID = '<asnID></asnID>'; // for now asnID var is not included in url; --- 169,172 ---- *************** *** 179,183 **** } ! var reqUrl = "bubble/recommenderProcessor.jsp?url="+ resUrl+ "&title="+resTitle+"&description="+ resDescription + "&id="+bmID + "&grades="+grades + "&stds=" + resStandards + "&subjects=" + subjects + "&AAASCode=" + resAAASCode +"&audience=" + resAudience + "&asnID="; new Ajax.Request( --- 180,184 ---- } ! var reqUrl = "bubble/recommenderProcessor.jsp?url="+ resUrl+ "&title="+resTitle+"&description="+ resDescription + "&id="+bmID + "&grades="+grades + "&stds=" + resStandards + "&subjects=" + subjects + "&audience=" + resAudience + "&asnID="; new Ajax.Request( *************** *** 189,193 **** c = response.responseText; c = c.replace(/^\s+|\s+$/g, '') ; ! processResponse(c, resUrl, resTitle, resDescription, bmID, grades, resStandards, subjects, resAAASCode, resAudience); }, onFailure: function (response) { --- 190,194 ---- c = response.responseText; c = c.replace(/^\s+|\s+$/g, '') ; ! processResponse(c, resUrl, resTitle, resDescription, bmID, grades, resStandards, subjects, bmID, resAudience); }, onFailure: function (response) { *************** *** 197,203 **** } ! function processResponse(resourceID, resUrl, resTitle, resDescription, bmID, grades, resStandards, subjects, resAAASCode, resAudience){ // check for confirm id, then send data via email ! var mailUrl = "bubble/mail.jsp?resourceID=" + resourceID + "&url="+ resUrl+ "&title="+resTitle+"&description="+ resDescription + "&id="+bmID + "&grades="+grades + "&stds=" + resStandards + "&subjects=" + subjects + "&AAASCode=" + resAAASCode +"&audience=" + resAudience; new Ajax.Request( mailUrl, --- 198,204 ---- } ! function processResponse(resourceID, resUrl, resTitle, resDescription, bmID, grades, resStandards, subjects, bmID, resAudience){ // check for confirm id, then send data via email ! var mailUrl = "bubble/mail.jsp?resourceID=" + resourceID + "&url="+ resUrl+ "&title="+resTitle+"&description="+ resDescription + "&id="+bmID + "&grades="+grades + "&stds=" + resStandards + "&subjects=" + subjects + "&bmID=" + bmID +"&audience=" + resAudience; new Ajax.Request( mailUrl, *************** *** 236,239 **** --- 237,244 ---- StrandMap.setPrintViewContent(content); }); + } else if(displaytype == 'strict'){ + sendResRequest(offset,'strict',function(content){ + StrandMap.setContent(content); + }); } else { resourcesTab.setContent('Loading...'); *************** *** 248,302 **** if(json != null){ - if(stdKeywords == ''){ - <!-- // get the relationships and relationship types for this benchmark //--> - var relArray = json.itemRecord.Data.InternalRelationship.CatalogID; - var stdStr = "STD"; - var index = 0; - var strandArray = new Array(); ! for(var k=0; k< relArray.length; k++){ ! if((relArray[k].RelationType == 'Is Part Of' || relArray[k].RelationType == 'is part of') && relArray[k].CatalogNumber.search(stdStr) != -1){ ! strandArray[index] = relArray[k].CatalogNumber; ! index++; ! ! numberOfStrands++; ! } ! } ! if(viewtype == 'print'){ ! for(var i = 0; i < strandArray.length; i++) { ! var myUrl = '@JSAPI_SERVICE_URL@/json?callBack=checkStrandPrint&Format=SMS-JSON&ObjectID='+strandArray[i]; ! ! var mapScriptReq = document.createElement( 'script' ); ! mapScriptReq.src = myUrl; ! ! // Insert the script in the document head, which executes the callback renderParentTab() ! document.getElementsByTagName('head')[0].appendChild( mapScriptReq ); ! } } else { ! for(var i = 0; i < strandArray.length; i++) { ! var myUrl = '@JSAPI_SERVICE_URL@/json?callBack=checkStrand&Format=SMS-JSON&ObjectID='+strandArray[i]; ! ! var mapScriptReq = document.createElement( 'script' ); ! mapScriptReq.src = myUrl; ! // Insert the script in the document head, which executes the callback renderParentTab() ! document.getElementsByTagName('head')[0].appendChild( mapScriptReq ); } ! } } - } } function sendResRequest(offset,displaytype,callback){ var json = StrandMap.getSelectedBenchmarkRecordJson(); ! <!--// get the map id //--> ! var referringMapId = StrandMap.getReferringMapId(); ! if(referringMapId != null){ ! var mapId = referringMapId; ! } else { ! var mapId = StrandMap.getMapId(); ! } ! ! if(!offset){ offset = 0; --- 253,305 ---- if(json != null){ ! if(viewtype == 'strict'){ ! getStrictRes(); } else { ! ! if(stdKeywords == ''){ ! <!-- // get the relationships and relationship types for this benchmark //--> ! var relArray = json.itemRecord.Data.InternalRelationship.CatalogID; ! var stdStr = "STD"; ! var index = 0; ! var strandArray = new Array(); ! for(var k=0; k< relArray.length; k++){ ! if((relArray[k].RelationType == 'Is Part Of' || relArray[k].RelationType == 'is part of') && relArray[k].CatalogNumber.search(stdStr) != -1){ ! strandArray[index] = relArray[k].CatalogNumber; ! index++; ! ! numberOfStrands++; ! } ! } ! if(viewtype == 'print'){ ! for(var i = 0; i < strandArray.length; i++) { ! var myUrl = '@JSAPI_SERVICE_URL@/json?callBack=checkStrandPrint&Format=SMS-JSON&ObjectID='+strandArray[i]; ! ! var mapScriptReq = document.createElement( 'script' ); ! mapScriptReq.src = myUrl; ! ! // Insert the script in the document head, which executes the callback renderParentTab() ! document.getElementsByTagName('head')[0].appendChild( mapScriptReq ); ! } ! } else { ! for(var i = 0; i < strandArray.length; i++) { ! var myUrl = '@JSAPI_SERVICE_URL@/json?callBack=checkStrand&Format=SMS-JSON&ObjectID='+strandArray[i]; ! ! var mapScriptReq = document.createElement( 'script' ); ! mapScriptReq.src = myUrl; ! ! // Insert the script in the document head, which executes the callback renderParentTab() ! document.getElementsByTagName('head')[0].appendChild( mapScriptReq ); ! } ! } } ! } } } function sendResRequest(offset,displaytype,callback){ var json = StrandMap.getSelectedBenchmarkRecordJson(); ! if(!offset){ offset = 0; *************** *** 305,394 **** displaytype=''; } ! <!-- // get the grades for this benchmark //--> ! var grArray = json.itemRecord.Data.GradeRanges.GradeRange; ! switch(grArray[0]) ! { ! case 'K': ! var grades = 'K'; ! break ! case '3': ! var grades = '3'; ! break ! case '6': ! var grades = '6'; ! break ! case '9': ! var grades = '9'; ! break ! default: ! ! } ! <!-- // get the keywords for this benchmark //--> ! var kwArray = json.itemRecord.Data.Keywords.keyword; ! var keywords = ''; ! for(var i=0; i< kwArray.length; i++){ ! if(i == 0){ ! keywords += kwArray[i]; ! } else if(i == kwArray.length-1){ ! keywords += '|' + kwArray[i]; } else { ! keywords += '|' + kwArray[i]; ! } ! } ! if(mapId == 'SMS-MAP-1496' || mapId == 'SMS-MAP-1504' || mapId == 'SMS-MAP-1478' || mapId == 'SMS-MAP-1487'){ ! var subjects = 'social studies'; ! } else { ! var subjects = ''; ! var subjArray = json.itemRecord.Data.Subjects.Subject; ! if(subjArray){ ! if(typeof(subjArray) == 'string'){ ! if(subjects.search(subjArray) == -1){ ! if(subjects == ''){ ! if(subjArray.search(':')){ ! var testsubj = subjArray.substr(subjArray.indexOf(':')+1); ! subjects += testsubj.replace(/#|\//g,'|'); ! } else { ! subjects += subjArray.replace(/#|\//g,'|'); ! } ! } } ! // If an array of keywords: } else { ! for(var m=0; m< subjArray.length; m++){ ! if(typeof subjArray[m] != 'undefined'){ ! if((subjects.search(subjArray[m].substr(subjArray[m].indexOf(':')+1)) == -1) && (subjects.search(subjArray[m]) == -1)){ ! if(m==0){ ! if(subjArray[m].search(':')){ ! var testsubj = subjArray[m].substr(subjArray[m].indexOf(':')+1); ! subjects += testsubj.replace(/#|\//g,'|'); ! } else { ! subjects += subjArray[m].replace(/#|\//g,'|'); ! } ! } else if(m == subjArray.length-1){ ! if(subjArray[m].search(':')){ ! var testsubj = subjArray[m].substr(subjArray[m].indexOf(':')+1); ! subjects += '|' + testsubj.replace(/#|\//g,'|'); ! } else { ! subjects += '|' + subjArray[m].replace(/#|\//g,'|'); ! } ! } else { ! if(subjArray[m].search(':')){ ! var testsubj = subjArray[m].substr(subjArray[m].indexOf(':')+1); ! subjects += '|' + testsubj.replace(/#|\//g,'|'); ! } else { ! subjects += '|' + subjArray[m].replace(/#|\//g,'|'); ! } ! } } - } } } } - } - - var reqUrl = "bubble/resources.jsp?keywords="+ keywords+ "&grades="+grades+"&subjects="+ subjects + "&startingOffset="+offset+ "&stdKeywords="+stdKeywords + "&displaytype="+displaytype; - new Ajax.Request( reqUrl, --- 308,417 ---- displaytype=''; } ! if(displaytype == 'strict'){ ! var recordJson = StrandMap.getSelectedBenchmarkRecordJson(); ! var AAASCode = recordJson.itemRecord.Data.AAASCode; ! var re = new RegExp('/[A-Z]*'); ! ! var grdloc = AAASCode.search(re); ! var newCode = AAASCode.substring(0,grdloc-1)+ '.' + AAASCode.substring(grdloc-1); ! var subCode = newCode.replace(re,'.'); ! var id = StrandMap.getSelectedBenchmarkId(); ! var reqUrl = "bubble/resourcesStrict.jsp?bmId="+ id + "&startingOffset=" + offset + "&displaytype="+displaytype+"&AAASCode="+AAASCode+"&subAAASCode="+subCode; } else { ! ! <!--// get the map id //--> ! var referringMapId = StrandMap.getReferringMapId(); ! if(referringMapId != null){ ! var mapId = referringMapId; ! } else { ! var mapId = StrandMap.getMapId(); ! } ! <!-- // get the grades for this benchmark //--> ! var grArray = json.itemRecord.Data.GradeRanges.GradeRange; ! switch(grArray[0]) ! { ! case 'K': ! var grades = 'K'; ! break ! case '3': ! var grades = '3'; ! break ! case '6': ! var grades = '6'; ! break ! case '9': ! var grades = '9'; ! break ! default: ! ! } ! <!-- // get the keywords for this benchmark //--> ! var kwArray = json.itemRecord.Data.Keywords.keyword; ! var keywords = ''; ! for(var i=0; i< kwArray.length; i++){ ! if(i == 0){ ! keywords += kwArray[i]; ! } else if(i == kwArray.length-1){ ! keywords += '|' + kwArray[i]; ! } else { ! keywords += '|' + kwArray[i]; } ! } ! ! if(mapId == 'SMS-MAP-1496' || mapId == 'SMS-MAP-1504' || mapId == 'SMS-MAP-1478' || mapId == 'SMS-MAP-1487'){ ! var subjects = 'social studies'; } else { ! var subjects = ''; ! var subjArray = json.itemRecord.Data.Subjects.Subject; ! if(subjArray){ ! if(typeof(subjArray) == 'string'){ ! if(subjects.search(subjArray) == -1){ ! if(subjects == ''){ ! if(subjArray.search(':')){ ! var testsubj = subjArray.substr(subjArray.indexOf(':')+1); ! subjects += testsubj.replace(/#|\//g,'|'); ! } else { ! subjects += subjArray.replace(/#|\//g,'|'); ! } ! } ! } ! // If an array of keywords: ! } else { ! for(var m=0; m< subjArray.length; m++){ ! if(typeof subjArray[m] != 'undefined'){ ! if((subjects.search(subjArray[m].substr(subjArray[m].indexOf(':')+1)) == -1) && (subjects.search(subjArray[m]) == -1)){ ! if(m==0){ ! if(subjArray[m].search(':')){ ! var testsubj = subjArray[m].substr(subjArray[m].indexOf(':')+1); ! subjects += testsubj.replace(/#|\//g,'|'); ! } else { ! subjects += subjArray[m].replace(/#|\//g,'|'); ! } ! } else if(m == subjArray.length-1){ ! if(subjArray[m].search(':')){ ! var testsubj = subjArray[m].substr(subjArray[m].indexOf(':')+1); ! subjects += '|' + testsubj.replace(/#|\//g,'|'); ! } else { ! subjects += '|' + subjArray[m].replace(/#|\//g,'|'); ! } ! } else { ! if(subjArray[m].search(':')){ ! var testsubj = subjArray[m].substr(subjArray[m].indexOf(':')+1); ! subjects += '|' + testsubj.replace(/#|\//g,'|'); ! } else { ! subjects += '|' + subjArray[m].replace(/#|\//g,'|'); ! } ! } ! } ! ! } } } } } + + var reqUrl = "bubble/resources.jsp?keywords="+ keywords+ "&grades="+grades+"&subjects="+ subjects + "&startingOffset="+offset+ "&stdKeywords="+stdKeywords + "&displaytype="+displaytype; } new Ajax.Request( reqUrl, *************** *** 400,403 **** --- 423,428 ---- c = response.responseText; callback(c); + }else { + alert('no'); } }, *************** *** 475,478 **** --- 500,514 ---- stdKeywords = newKeywords; } + function getStrictRes(){ + sendResRequest('','strict',function(content){ + var re = new RegExp('/[A-Z]*'); + var contentCheck = content.search(re); + if(contentCheck > -1){ + resourcesTab.setContent(content); + } else { + getResources(''); + } + }); + } function checkStrand(jsonResponse){ getStrandKeywords(jsonResponse); |
|
From: S C. <sl...@us...> - 2008-04-18 21:43:30
|
Update of /cvsroot/strandmapservic/nsdl-client-project/web/bubble In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv14982/web/bubble Modified Files: recommenderProcessor.jsp Added Files: resourcesStrict.jsp Log Message: code updates to only submit SMS-BMK id for recommendations. Search checks some variations of benchmark alignment before performing full search. Index: recommenderProcessor.jsp =================================================================== RCS file: /cvsroot/strandmapservic/nsdl-client-project/web/bubble/recommenderProcessor.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** recommenderProcessor.jsp 29 Feb 2008 23:29:06 -0000 1.1 --- recommenderProcessor.jsp 18 Apr 2008 21:43:25 -0000 1.2 *************** *** 11,15 **** String audience = request.getParameter("audience"); String resourceType = request.getParameter("resourceType"); - String AAASCode = request.getParameter("AAASCode"); String asnID = request.getParameter("asnID"); %> --- 11,14 ---- *************** *** 24,28 **** <c:set var="audience" value="<%=audience%>"/> <c:set var="resourcetype" value="<%=resourceType%>"/> - <c:set var="AAASCode" value="<%=AAASCode%>"/> <c:set var="asnID" value="<%=asnID%>"/> <c:set var="baseUrl" value="http://ncs.nsdl.org/mgr/services/recommend.do" /> --- 23,26 ---- *************** *** 73,77 **** ${standards} <otherStandard>${bmID}</otherStandard> - <otherStandard>${AAASCode}</otherStandard> </standards> <audiences> --- 71,74 ---- --- NEW FILE: resourcesStrict.jsp --- <%@ include file="../../TagLibIncludes.jsp" %> <%-- Grab the required service URLs (defined in web.xml or server.xml): --%> <c:set var="smsCsipBaseUrl" value="${initParam.smsCsipBaseUrl}" /> <c:set var="nsdlSearchBaseUrl" value="${initParam.nsdlSearchBaseUrl}" /> <% String startingOffset = request.getParameter("startingOffset"); String bmId = request.getParameter("bmId"); String AAASCode = request.getParameter("AAASCode"); String subAAASCode = request.getParameter("subAAASCode"); String displaytype = request.getParameter("displaytype"); %> <c:set var="startingOffset" value="<%=startingOffset%>"/> <c:set var="bmId" value="<%=bmId%>"/> <c:set var="subAAASCode" value="<%=subAAASCode%>"/> <c:set var="AAASCode" value="<%=AAASCode%>"/> <c:set var="displaytype" value="<%=displaytype%>"/> <c:set var="query" value='dct\:conformsTo:("${bmId}" OR "*${AAASCode}*" OR "*${subAAASCode}*")'/> <%-- The maximum character length of the description that gets displayed in the initial search results. A smaller value here will make the search results page more compact. Leave blank to display the full description text regardles off its length --%> <c:set var="maxDescriptionLength" value="400" /> <c:set var="maxTitleLength" value="90" /> <%-- The maximum character length of the URL that gets displayed in the UI. A smaller value here will prevent problems with HTML wrapping --%> <c:set var="maxUrlLength" value="85" /> <%-- Set up the variables used for paging through results--%> <c:set var="startingOffset"> <c:if test="${empty startingOffset}">0</c:if> <c:if test="${!empty startingOffset}"><c:out value="${startingOffset}"/></c:if> </c:set> <%-- Issue the request to the web service. If a connection error occurs, store it in variable 'serviceError' --%> <c:catch var="serviceError"> <%-- Construct the http request to send to the web service and store it in variable 'webServiceRequest' --%> <c:url value="${nsdlSearchBaseUrl}" var="webServiceRequest"> <%-- Define each of the http parameters used in the request --%> <c:param name="verb" value="Search"/> <%-- Begin the result at the current offset --%> <c:param name="s" value="${startingOffset}"/> <%-- Return 5 results --%> <c:param name="n" value="5"/> <%-- Perform a textual search using the user's input --%> <c:param name="q" value="${query}"/> </c:url> <%-- Issue the request to the Web service server and store the response in variable 'xmlResponse' --%> <c:import url="${webServiceRequest}" var="xmlResponse" charEncoding="UTF-8" /> <%-- Remove namespaces from the XML and create the DOM --%> <x:transform xslt="${f:removeNamespacesXsl()}" xml="${xmlResponse}" var="xmlDom"/> <c:if test="${not empty serviceError}"> Sorry, our system has encountered a problem and we were unable to perform your search at this time. Please try again later. </c:if> <%-- Display the record metadata to the user (if no connection error occured) --%> <c:if test="${empty serviceError}"> <x:choose> <%-- If the total number of results is greater than zero, display them --%> <x:when select="$xmlDom/NSDLSearchService/SearchResults/resultsInfo/totalNumResults > 0"> <h2>NSDL Resources</h2> <%-- ------ Begin paging logic ------ --%> <%-- Save the number of results in variable 'numResults' --%> <c:set var="numResults"> <x:out select="$xmlDom/NSDLSearchService/SearchResults/resultsInfo/totalNumResults"/> </c:set> <c:set var="pageIndex"> <%-- Create and store the HTML for the pager in variable 'pager' --%> <nobr> ${numResults > 1 ? 'results':'result'} <c:out value="${startingOffset +1}"/> - <c:if test="${startingOffset + 5 > numResults}"> <c:out value="${numResults}"/> </c:if> <c:if test="${startingOffset + 5 <= numResults}"> <c:out value="${startingOffset + 5}"/> </c:if> </nobr> <nobr>out of <span id="numResults${section}"><c:out value="${numResults}"/></span></nobr> <br/> <c:if test="${(startingOffset - 5) >= 0 && param.view != 'print'}"> <a href="javascript:updateResources(${startingOffset - 5},'${displaytype}')"><< Prev</a> </c:if> <!--//The total number of pages we can display based on the number of search results//--> <c:set var="total_pages_full">${numResults div 5}</c:set> <c:set value="${fn:substringBefore(total_pages_full,'.')}" var="total_pages" /> <c:set var="total_pages_fraction">${fn:substringAfter(total_pages_full,'.')}</c:set> <c:set var="total_pages_integer">${fn:substringBefore(total_pages_full,'.')}</c:set> <c:if test="${(total_pages_fraction > 0) && (total_pages_integer > 0)}"> <c:set var="total_pages">${total_pages + 1}</c:set> </c:if> <!--//The result page we are currently on (add 1 to it)//--> <c:set var="current_page">${fn:substringBefore((startingOffset div 5), '.') + 1}</c:set> <!--// The number of page links we want to display in the pagination nav //--> <c:set var="set_page_display">11</c:set> <!--// Skip to this page number based on the page we're on //--> <c:set var="start_page">${current_page - (fn:substringBefore((set_page_display div 2), '.') + 1)}</c:set> <c:choose> <c:when test="${(total_pages > (set_page_display - 1)) && (current_page > (set_page_display/2))}"> <c:set var="end_page">${current_page + fn:substringBefore(((set_page_display/2) - 1), '.')}</c:set> </c:when> <c:when test="${total_pages < (set_page_display - 1)}"> <c:set var="end_page">${total_pages}</c:set> </c:when> <c:otherwise> <c:set var="end_page">${set_page_display - 1}</c:set> </c:otherwise> </c:choose> <c:choose> <c:when test="${start_page < 1}"> <c:set var="start_page">1</c:set> </c:when> <c:when test="${end_page ge set_page_display}"> <c:set var="start_page">${start_page + 1}</c:set> </c:when> <c:otherwise> <c:set var="start_page">${start_page}</c:set> </c:otherwise> </c:choose> <c:if test="${end_page ge total_pages}"> <c:set var="end_page">${total_pages}</c:set> </c:if> <c:if test="${current_page >= 6}"> <c:choose> <c:when test="${current_page >= 7}"> <a href="javascript:updateResources(0,'${displaytype}')">1</a>... </c:when> </c:choose> </c:if> <c:if test="${total_pages > 1}"> <c:forEach var="i" begin="${start_page}" end="${end_page}" varStatus="status"> <c:choose> <c:when test="${i == current_page}"> <strong>${i}</strong> </c:when> <c:otherwise> <c:set var="next_skip">${(i*5)-5}</c:set> <a href="javascript:updateResources(${next_skip},'${displaytype}')">${i}</a> </c:otherwise> </c:choose> </c:forEach> </c:if> <c:if test="${(current_page < (total_pages - 5)) && (total_pages > (set_page_display - 1))}"> <c:set var="next_skip">${(total_pages*5)-5}</c:set> ...<a href="javascript:updateResources(${next_skip},'${displaytype}')">${total_pages}</a> </c:if> <c:if test="${(startingOffset + 5) < numResults && param.view != 'print'}"> <a href="javascript:updateResources(${startingOffset + 5},'${displaytype}')">Next >></a> </c:if> </c:set> ${pageIndex} <%-- ------ end paging logic ------ --%> <div id="resourceList"> <c:set var="mySectionIndex"> itemIndex<c:out value="${section}"/> </c:set> <span id="${mySectionIndex}" class="navIndex">${pager}</span> <%-- Render a gray line --%> <hr/> <%-- Loop through each of the record nodes --%> <x:forEach select="$xmlDom/NSDLSearchService/SearchResults/results/document"> <%-- We are already at XPath $xmlDom/NSDLSearchService/SearchResults/results/document so we can continue our path from there --%> <c:set var="resourceURL"> <x:out select="header/resourceIdentifier"/> </c:set> <c:set var="resourceTitle"> <x:out select="fields/title"/> </c:set> <c:set var="description"> <x:out select="fields/compoundDescription"/> </c:set> <p class="resource, stdlink" id="resourceItem"> <div class="resourceTitle"> <c:if test="${not empty maxTitleLength && fn:length(resourceTitle) > maxTitleLength}"> <%-- Make sure the truncation occurs on white space and not in the middle of a word --%> <c:set var="numChars" value="0"/> <c:set var="resourceTitle"> <c:set var="words" value="${fn:split( resourceTitle, ' ')}"/> <c:forEach items="${words}" var="word"> <c:if test="${numChars < maxTitleLength}"> ${word} <c:set var="numChars" value="${numChars + fn:length( word ) + 1}"/> </c:if> </c:forEach> ... </c:set> </c:if> <a href='${resourceURL}' target="_blank" class="boldlink">${resourceTitle}</a> </div> <div class="resourceUrl"> <c:choose> <c:when test="${ fn:length(resourceURL) > maxUrlLength }"> <a href="${resourceURL}" target="_blank">${fn:substring(resourceURL,0,maxUrlLength)} ...</a> </c:when> <c:otherwise> <a href="${resourceURL}" target="_blank">${resourceURL}</a> </c:otherwise> </c:choose> </div> <div class="resourceDescription"> <%-- Truncate the description text if necessary --%> <c:if test="${not empty maxDescriptionLength && fn:length(description) > maxDescriptionLength}"> <%-- Make sure the truncation occurs on white space and not in the middle of a word --%> <c:set var="numChars" value="0"/> <c:set var="description"> <c:set var="words" value="${fn:split( description, ' ')}"/> <c:forEach items="${words}" var="word"> <c:if test="${numChars < maxDescriptionLength}"> ${word} <c:set var="numChars" value="${numChars + fn:length( word ) + 1}"/> </c:if> </c:forEach> ... </c:set> </c:if> ${description} </div> </p> <hr /> </x:forEach> <span id="${mySectionIndex}" class="navIndex">${pager}</span> </div> ${pageIndex} </x:when> <%-- If there were no matches, report to user --%> </x:choose> </c:if> </c:catch> |
|
From: S C. <sl...@us...> - 2008-03-18 19:54:27
|
Update of /cvsroot/strandmapservic/nsdl-client-project/web/AAAS-Collection In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv16454/web/AAAS-Collection Modified Files: NSDLbenchmarksContent.jsp Log Message: When accessing from NSDL search, parent map id is not available and shouldn't be included in the related benchmarks url. Index: NSDLbenchmarksContent.jsp =================================================================== RCS file: /cvsroot/strandmapservic/nsdl-client-project/web/AAAS-Collection/NSDLbenchmarksContent.jsp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** NSDLbenchmarksContent.jsp 19 Oct 2007 22:27:38 -0000 1.7 --- NSDLbenchmarksContent.jsp 18 Mar 2008 19:54:22 -0000 1.8 *************** *** 344,353 **** <label> <br> ! <!-- <input name="benchmarkMap" type="image" id="benchmarkMap" src="images/mapButton2.png" alt="Show map of benchmarks" /> --> ! <!-- <a href="http://preview.dlese.org/jsp/cms/populatemaps?mapid=<c:out value="${mapid}" />" target=_blank onmouseout="MM_swapImgRestore();" onmouseover="MM_swapImage('mapButton2','','images/mapButton2_f2.jpg',1);"><img name="mapButton2" src="images/mapButton2.jpg" width="63" height="52" border="0" id="mapButton2" alt="" /></a> --> ! ! <a href="/?id=${mapId}&bm=${bm}" target="_blank" onmouseout="MM_swapImgRestore();" onmouseover="MM_swapImage('mapButton2','','images/mapButton2_f2.jpg',1);"><img name="mapButton2" src="images/mapButton2.jpg" width="63" height="52" border="0" id="mapButton2" alt="" /></a> ! ! </label> </form> <p align="left">View a map of how this benchmark relates to other benchmarks.</p> --- 344,356 ---- <label> <br> ! <c:choose> ! <c:when test="${not empty mapId}"> ! <a href="/?parentmap=${mapId}&id=${bm}" target="_blank" onmouseout="MM_swapImgRestore();" onmouseover="MM_swapImage('mapButton2','','images/mapButton2_f2.jpg',1);"><img name="mapButton2" src="images/mapButton2.jpg" width="63" height="52" border="0" id="mapButton2" alt="" /></a> ! </c:when> ! <c:otherwise> ! <a href="/?id=${bm}" target="_blank" onmouseout="MM_swapImgRestore();" onmouseover="MM_swapImage('mapButton2','','images/mapButton2_f2.jpg',1);"><img name="mapButton2" src="images/mapButton2.jpg" width="63" height="52" border="0" id="mapButton2" alt="" /></a> ! </c:otherwise> ! </c:choose> ! </label> </form> <p align="left">View a map of how this benchmark relates to other benchmarks.</p> |
|
From: John W. <jwe...@us...> - 2008-03-12 17:21:10
|
Update of /cvsroot/strandmapservic/smsServer/docs In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv20781/docs Modified Files: CHANGES.txt Log Message: updated version Index: CHANGES.txt =================================================================== RCS file: /cvsroot/strandmapservic/smsServer/docs/CHANGES.txt,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** CHANGES.txt 13 Feb 2008 21:36:36 -0000 1.5 --- CHANGES.txt 12 Mar 2008 17:21:05 -0000 1.6 *************** *** 4,7 **** --- 4,11 ---- ----------------------------------------------------------------------------- + Changes in v1.2.11-rc1 + - added new maps from Atlas II (approx 40 new maps and two new chapters) + - updated visualiztion renderer to handle some issues in the new maps + Changes in v1.2.10 - fixed rendering/positioning of strands labels in the map visualizations (Gravity map example) |
|
From: John W. <jwe...@us...> - 2008-03-12 17:21:10
|
Update of /cvsroot/strandmapservic/smsServer In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv20781 Modified Files: build.xml Log Message: updated version Index: build.xml =================================================================== RCS file: /cvsroot/strandmapservic/smsServer/build.xml,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** build.xml 13 Feb 2008 21:36:36 -0000 1.18 --- build.xml 12 Mar 2008 17:21:05 -0000 1.19 *************** *** 52,56 **** <!-- The following two properties should be updated below each time a new release or version is issued --> ! <property name="app.version" value="1.2.10"/> <property name="context.name" value="cms1-2"/> --- 52,56 ---- <!-- The following two properties should be updated below each time a new release or version is issued --> ! <property name="app.version" value="1.2.11-rc1"/> <property name="context.name" value="cms1-2"/> |
|
From: John W. <jwe...@us...> - 2008-03-12 17:00:15
|
Update of /cvsroot/strandmapservic/smsServer/WEB-INF/src/edu/cu/cs/sms/svg In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv12000/WEB-INF/src/edu/cu/cs/sms/svg Modified Files: my_process_old.java Log Message: address some issues rendering the new maps Index: my_process_old.java =================================================================== RCS file: /cvsroot/strandmapservic/smsServer/WEB-INF/src/edu/cu/cs/sms/svg/my_process_old.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** my_process_old.java 3 Mar 2008 21:10:55 -0000 1.8 --- my_process_old.java 12 Mar 2008 17:00:02 -0000 1.9 *************** *** 1,3 **** ! /* * Copyright 2002-2005 Boulder Learning Technologies Lab & American Association for the Advancement of Science, * DLC-1B20, Department of Computer Science, University of Colorado at Boulder, --- 1,3 ---- ! /* * Copyright 2002-2005 Boulder Learning Technologies Lab & American Association for the Advancement of Science, * DLC-1B20, Department of Computer Science, University of Colorado at Boulder, *************** *** 633,639 **** drawMap(); ! //PrintWriter pw = new PrintWriter(new FileOutputStream("C:\\Documents and Settings\\Qianyi Gu\\Desktop\\TestFile.svg"),true); ! //pw.write(outs2.toString()); ! //pw.close(); --- 633,644 ---- drawMap(); ! ! /* ! ! PrintWriter pw = new PrintWriter(new FileOutputStream("C:\\Documents and Settings\\Qianyi Gu\\Desktop\\TestFile.svg"),true); ! pw.write(outs2.toString()); ! pw.close(); ! ! */ *************** *** 1302,1307 **** Iterator it = current_process.iterator(); ! while(it.hasNext()) ! System.out.println("BMK ID : "+((benchmark)it.next()).getID()); } --- 1307,1312 ---- Iterator it = current_process.iterator(); ! //while(it.hasNext()) ! //System.out.println("BMK ID : "+((benchmark)it.next()).getID()); } *************** *** 2050,2054 **** double white_ratio=1.1; ! System.out.println("width is"+box_w); double v_scale=0.0, h_scale=0.0; --- 2055,2059 ---- double white_ratio=1.1; ! //System.out.println("width is"+box_w); double v_scale=0.0, h_scale=0.0; *************** *** 2139,2142 **** --- 2144,2201 ---- Strand st5 = (Strand)StrandList.elementAt(4); //System.out.println("st1 is: " +st1); + + // process the strand name positions: + int strand1=-1,strand2=-2,strand3=-3,strand4=-4,strand5=-5; + int mypoint=0; + boolean overlap=false; + + if (st1.getV()>0) + { + strand1=st1.getV(); + } + + if (st2.getV()>0) + { + strand2=st2.getV(); + } + + if (st3.getV()>0) + { + strand3=st3.getV(); + } + + if (st4.getV()>0) + { + strand4=st4.getV(); + } + + if (st5.getV()>0) + { + strand5=st5.getV(); + } + + + + if ((strand1==strand2)||(strand1==strand3)||(strand1==strand4)||(strand1==strand5)||(strand2==strand3)||(strand2==strand4)||(strand2==strand5)||(strand3==strand4)||(strand3==strand5)||(strand4==strand5)) + { + strand1=1; + strand2=3; + strand3=5; + strand4=7; + strand5=9; + overlap=true; + + + } + + + + + + //System.out.println("Overlap is: "+overlap); + + + + if (intersection==false) *************** *** 2145,2149 **** if (st1.getV()>0) { ! stx=st1.getV(); SX=(double)(stx-minH)*h_scale; --- 2204,2208 ---- if (st1.getV()>0) { ! stx=strand1; SX=(double)(stx-minH)*h_scale; *************** *** 2152,2165 **** outs2.println("</a>"); ! System.out.println("Strand Name:"+st1.getName()+"; Strand Position"+stx); ! System.out.println("Strand Name:"+st1.getName()+"; Strand Position"+SX); } if (st2.getV()>0) { ! stx=st2.getV(); SX=(double)(stx-minH)*h_scale+5.0; // System.out.println("draw second strand name here:"+SX); //System.out.println("draw strand name here:"+st1.getV()+"; "+st1.getName()); outs2.println("<a xlink:href=\""+st2.getID()+"\">"); --- 2211,2233 ---- outs2.println("</a>"); ! //System.out.println("Strand Name:"+st1.getName()+"; Strand Position"+stx); ! //System.out.println("Strand Name:"+st1.getName()+"; Strand Position"+SX); } if (st2.getV()>0) { ! stx=strand2; SX=(double)(stx-minH)*h_scale+5.0; // System.out.println("draw second strand name here:"+SX); //System.out.println("draw strand name here:"+st1.getV()+"; "+st1.getName()); + + if (st2.getName().length()>60) + { + String tempname=st2.getName(); + int spacepos=tempname.indexOf(" ",35); + tempname=tempname.substring(0,spacepos); + st2.setName(tempname); + } + outs2.println("<a xlink:href=\""+st2.getID()+"\">"); *************** *** 2167,2171 **** outs2.println("</a>"); ! System.out.println("Strand Name:"+st2.getName()+"; Strand Position"+stx); } --- 2235,2239 ---- outs2.println("</a>"); ! //System.out.println("Strand Name:"+st2.getName()+"; Strand Position"+stx); } *************** *** 2173,2177 **** if (st3.getV()>0) { ! stx=st3.getV(); SX=(double)(stx-minH)*h_scale+25.0; // System.out.println("draw third strand name here:"+SX); --- 2241,2245 ---- if (st3.getV()>0) { ! stx=strand3; SX=(double)(stx-minH)*h_scale+25.0; // System.out.println("draw third strand name here:"+SX); *************** *** 2182,2186 **** outs2.println("</a>"); ! System.out.println("Strand Name:"+st3.getName()+"; Strand Position"+stx); --- 2250,2254 ---- outs2.println("</a>"); ! //System.out.println("Strand Name:"+st3.getName()+"; Strand Position"+stx); *************** *** 2189,2196 **** if (st4.getV()>0) { ! stx=st4.getV(); - if (st4.getV()<=st3.getV()) - {stx=stx+2;} SX=(double)(stx-minH)*h_scale+40.0; --- 2257,2263 ---- if (st4.getV()>0) { ! stx=strand4; ! SX=(double)(stx-minH)*h_scale+40.0; *************** *** 2201,2205 **** outs2.println("</a>"); ! System.out.println("Strand Name:"+st4.getName()+"; Strand Position"+stx); } --- 2268,2272 ---- outs2.println("</a>"); ! //System.out.println("Strand Name:"+st4.getName()+"; Strand Position"+stx); } *************** *** 2207,2211 **** if (st5.getV()>0) { ! stx=st5.getV(); SX=(double)(stx-minH)*h_scale-50.0; // System.out.println("draw fifth strand name here:"+st5.getV()); --- 2274,2278 ---- if (st5.getV()>0) { ! stx=strand5; SX=(double)(stx-minH)*h_scale-50.0; // System.out.println("draw fifth strand name here:"+st5.getV()); |
|
From: John W. <jwe...@us...> - 2008-03-11 23:09:48
|
Update of /cvsroot/strandmapservic/nsdl-client-project/web In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv16592/web Modified Files: index.html Log Message: added the two new chapters from Atlas II Index: index.html =================================================================== RCS file: /cvsroot/strandmapservic/nsdl-client-project/web/index.html,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** index.html 29 Feb 2008 23:29:06 -0000 1.51 --- index.html 11 Mar 2008 23:09:36 -0000 1.52 *************** *** 70,74 **** --- 70,76 ---- <li><a href="?chapter=SMS-CHP-1037">The Designed World</a></li> <li><a href="?chapter=SMS-CHP-1068">The Mathematical World</a></li> + <li><a href="?chapter=SMS-CHP-1094">Historical Perspectives</a></li> <li><a href="?chapter=SMS-CHP-1119">Common Themes</a></li> + <li><a href="?chapter=SMS-CHP-1140">Habits of Mind</a></li> <li><a href="?chapter=ALL">View All Topics</a></li> </ul> |
|
From: John W. <jwe...@us...> - 2008-03-11 22:37:09
|
Update of /cvsroot/strandmapservic/smsServer/WEB-INF/Database In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv3780/WEB-INF/Database Modified Files: strandmap.sql Log Message: -added new maps from Atlas II Index: strandmap.sql =================================================================== RCS file: /cvsroot/strandmapservic/smsServer/WEB-INF/Database/strandmap.sql,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** strandmap.sql 12 Nov 2007 22:36:49 -0000 1.2 --- strandmap.sql 11 Mar 2008 22:37:00 -0000 1.3 *************** *** 1,5886 **** ! DROP TABLE IF EXISTS `objects`; ! CREATE TABLE objects (`ExternalResources` longtext NULL,`Standards` longtext NULL,`object_type` varchar (255) NOT NULL ,`object_ID` varchar (255) NOT NULL ,`Name` text NOT NULL ,`source` varchar (255) NULL,`primary_grade` varchar (255) NULL,`second_grade` varchar (255) NULL,`record_status` varchar (255) NULL,`full_text` text NULL,`description` text NULL,`subjects` varchar (255) NULL,`keywords` text NULL,`metadata_code` varchar (255) NULL,`metadata_lan` varchar (255) NULL,`date_created` date NULL,`clarification` longtext NULL,`student_conceptions` longtext NULL,`examples` longtext NULL,`assessments` longtext NULL,`instructional_information` longtext NULL,`serial` varchar (255) NULL,`aaas_code` varchar (255) NULL,`code_plus` varchar (255) NULL, PRIMARY KEY (object_ID)); ! DROP TABLE IF EXISTS `registeredqueries`; ! CREATE TABLE registeredqueries (`PublishedName` varchar (255) NOT NULL ,`QueryHost` longtext NULL,`QueryString` longtext NOT NULL ,`AuthenticationCode` varchar (255) NULL,`Encoding` enum ('UTF-8','ASCII','Cp1252','ISO8859_1','UnicodeBig','UnicodeBigUnmarked','UnicodeLittle','UnicodeLittleUnmarked','UTF8','UTF-16','MIN-URL','None') NOT NULL ,`Status` enum ('Enable','Disable') NOT NULL ,`ObjectName` varchar (100) NOT NULL , PRIMARY KEY (ObjectName, PublishedName)); ! DROP TABLE IF EXISTS `relation`; ! CREATE TABLE relation (`ItemID1` varchar (255) NOT NULL ,`ItemID2` varchar (255) NOT NULL ,`RelationType` varchar (255) NOT NULL , PRIMARY KEY (ItemID1, ItemID2)); ! DROP TABLE IF EXISTS `strandpos`; ! CREATE TABLE strandpos (`object_ID` varchar (100) NOT NULL ,`Pos` varchar (100) NOT NULL , PRIMARY KEY (object_ID)); ! ! LOCK TABLES `objects` WRITE; [...23262 lines suppressed...] ! INSERT INTO strandpos VALUES ('SMS-STD-2519', '4'); ! INSERT INTO strandpos VALUES ('SMS-STD-2520', '2'); ! INSERT INTO strandpos VALUES ('SMS-STD-2521', '2'); ! INSERT INTO strandpos VALUES ('SMS-STD-2522', '1'); ! INSERT INTO strandpos VALUES ('SMS-STD-2523', '3'); ! INSERT INTO strandpos VALUES ('SMS-STD-2532', '1'); ! INSERT INTO strandpos VALUES ('SMS-STD-2533', '2'); ! INSERT INTO strandpos VALUES ('SMS-STD-2534', '3'); ! INSERT INTO strandpos VALUES ('SMS-STD-2562', '1'); ! INSERT INTO strandpos VALUES ('SMS-STD-2563', '2'); ! INSERT INTO strandpos VALUES ('SMS-STD-2564', '3'); ! INSERT INTO strandpos VALUES ('SMS-STD-2565', '4'); ! INSERT INTO strandpos VALUES ('SMS-STD-9002', '1'); ! INSERT INTO strandpos VALUES ('SMS-STD-9003', '2'); ! INSERT INTO strandpos VALUES ('SMS-STD-9004', '3'); ! INSERT INTO strandpos VALUES ('SMS-STD-9031', '1'); ! INSERT INTO strandpos VALUES ('SMS-STD-9032', '2'); ! INSERT INTO strandpos VALUES ('SMS-STD-9033', '3'); ! INSERT INTO strandpos VALUES ('SMS-STD-9034', '4'); ! UNLOCK TABLES; |
|
From: S C. <sl...@us...> - 2008-03-05 17:17:13
|
Update of /cvsroot/strandmapservic/nsdl-client-project/web/js In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv25565/web/js Modified Files: nsdlclientsms.js Log Message: Provide feedback that the resource is submitting in case form is slow Index: nsdlclientsms.js =================================================================== RCS file: /cvsroot/strandmapservic/nsdl-client-project/web/js/nsdlclientsms.js,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** nsdlclientsms.js 29 Feb 2008 23:29:06 -0000 1.5 --- nsdlclientsms.js 5 Mar 2008 17:17:09 -0000 1.6 *************** *** 172,176 **** var subjects = ''; - for(var i=1;i<=6;i++){ if(document.getElementById('subject_'+i).checked == true){ --- 172,175 ---- *************** *** 205,208 **** --- 204,210 ---- { method: 'post', + onLoading: function() { + recommendTab.setContent('Submitting resource...'); + }, onComplete: function () { refreshForm(resUrl); *************** *** 212,216 **** function refreshForm(resUrl){ var reqUrl = "bubble/recommender.jsp?url=" +resUrl; - recommendTab.setContent('Loading...'); new Ajax.Request( reqUrl, --- 214,217 ---- |
|
From: S C. <sl...@us...> - 2008-03-04 20:17:15
|
Update of /cvsroot/strandmapservic/nsdl-client-project/web/bubble In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv15861/web/bubble Modified Files: mail.jsp Log Message: change mail server to localhost Index: mail.jsp =================================================================== RCS file: /cvsroot/strandmapservic/nsdl-client-project/web/bubble/mail.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mail.jsp 29 Feb 2008 23:29:06 -0000 1.1 --- mail.jsp 4 Mar 2008 20:17:12 -0000 1.2 *************** *** 19,23 **** try{ ! SmtpClient client = new SmtpClient("mail.nsdl.ucar.edu"); client.from(from); client.to(to); --- 19,23 ---- try{ ! SmtpClient client = new SmtpClient("localhost"); client.from(from); client.to(to); |
|
From: John W. <jwe...@us...> - 2008-03-03 21:10:59
|
Update of /cvsroot/strandmapservic/smsServer/WEB-INF/src/edu/cu/cs/sms/svg In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv25636/WEB-INF/src/edu/cu/cs/sms/svg Modified Files: my_process_old.java Log Message: -removed debug code (was causing exception to be thrown) Index: my_process_old.java =================================================================== RCS file: /cvsroot/strandmapservic/smsServer/WEB-INF/src/edu/cu/cs/sms/svg/my_process_old.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** my_process_old.java 13 Feb 2008 20:10:09 -0000 1.7 --- my_process_old.java 3 Mar 2008 21:10:55 -0000 1.8 *************** *** 633,639 **** drawMap(); ! PrintWriter pw = new PrintWriter(new FileOutputStream("C:\\Documents and Settings\\Qianyi Gu\\Desktop\\TestFile.svg"),true); ! pw.write(outs2.toString()); ! pw.close(); --- 633,639 ---- drawMap(); ! //PrintWriter pw = new PrintWriter(new FileOutputStream("C:\\Documents and Settings\\Qianyi Gu\\Desktop\\TestFile.svg"),true); ! //pw.write(outs2.toString()); ! //pw.close(); |
