Changeset 27018 for main/trunk
- Timestamp:
- 2013-03-07T14:13:30+13:00 (11 years ago)
- Location:
- main/trunk/greenstone2/macros
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/macros/depositdspace.dm
r27014 r27018 275 275 276 276 277 function comma\_ decode(str)277 function comma\_and\_special_chars\_decode(str) 278 278 \{ 279 var newstr = str.replace(/\\%27/g,"'"); 279 var newstr = newstr = str.replace(/\\%2F/g,"/"); 280 newstr = newstr.replace(/\\%27/g,"'"); 281 newstr = newstr.replace(/\\%22/g,"\\\""); 282 newstr = newstr.replace(/\\%26/g,"&"); 283 newstr = newstr.replace(/\\%3E/g,">"); 284 newstr = newstr.replace(/\\%3C/g,"<"); 280 285 281 286 // the comma was already being decoded for dspace's deposit dm file … … 293 298 if (prevarray.value) \{ 294 299 295 var prevvalarray = comma\_ decode(prevarray.value);300 var prevvalarray = comma\_and\_special_chars\_decode(prevarray.value); 296 301 297 302 var fieldnum = get\_fieldid(fieldid,"num"); … … 1363 1368 var authornum = "_di1authornum_"; 1364 1369 var authorsplit = "_di1authorsplit_"; 1365 var authorarray = comma\_ decode("_di1authorarray_");1370 var authorarray = comma\_and\_special_chars\_decode("_di1authorarray_"); 1366 1371 1367 1372 present\_general(authorarray,authornum,authorsplit,combine\_author); … … 1384 1389 var seriesrepnum = "_di1seriesrepnum_"; 1385 1390 var seriesrepsplit = "_di1seriesrepsplit_"; 1386 var seriesreparray = comma\_ decode("_di1seriesreparray_");1391 var seriesreparray = comma\_and\_special_chars\_decode("_di1seriesreparray_"); 1387 1392 1388 1393 present\_general(seriesreparray,seriesrepnum,seriesrepsplit,combine\_seriesrep); … … 1398 1403 var idnum = "_di1identifiernum_"; 1399 1404 var idsplit = "_di1identifiersplit_"; 1400 var idarray = comma\_ decode("_di1identifierarray_");1405 var idarray = comma\_and\_special_chars\_decode("_di1identifierarray_"); 1401 1406 1402 1407 present\_general(idarray,idnum,idsplit,combine\_id); … … 1445 1450 var subnum = "_di1subjectnum_"; 1446 1451 var subsplit = "_di1subjectsplit_"; 1447 var subarray = comma\_ decode("_di1subjectarray_");1452 var subarray = comma\_and\_special_chars\_decode("_di1subjectarray_"); 1448 1453 1449 1454 present\_general(subarray,subnum,subsplit,combine\_flat); … … 1559 1564 var authornum = "_di1authornum_"; 1560 1565 var authorsplit = "_di1authorsplit_"; 1561 var authorarray = comma\_ decode("_di1authorarray_");1566 var authorarray = comma\_and\_special_chars\_decode("_di1authorarray_"); 1562 1567 var combauthor = combine\_escauthor(authorarray,authornum,authorsplit); 1563 1568 hidden\_multifield("ds.Author",combauthor); … … 1565 1570 var seriesrepnum = "_di1seriesrepnum_"; 1566 1571 var seriesrepsplit = "_di1seriesrepsplit_"; 1567 var seriesreparray = comma\_ decode("_di1seriesreparray_");1572 var seriesreparray = comma\_and\_special_chars\_decode("_di1seriesreparray_"); 1568 1573 var combseriesrep = combine\_seriesrep(seriesreparray,seriesrepnum,seriesrepsplit); 1569 1574 hidden\_multifield("ds.Series",combseriesrep); … … 1571 1576 var idnum = "_di1identifiernum_"; 1572 1577 var idsplit = "_di1identifiersplit_"; 1573 var idarray = comma\_ decode("_di1identifierarray_");1578 var idarray = comma\_and\_special_chars\_decode("_di1identifierarray_"); 1574 1579 var combid = combine\_id(idarray,idnum,idsplit); 1575 1580 hidden\_multifield("ds.Identifier",combid); … … 1578 1583 var subnum = "_di1subjectnum_"; 1579 1584 var subsplit = "_di1subjectsplit_"; 1580 var subarray = comma\_ decode("_di1subjectarray_");1585 var subarray = comma\_and\_special_chars\_decode("_di1subjectarray_"); 1581 1586 var combsub = combine\_flat(subarray,subnum,subsplit); 1582 1587 hidden\_multifield("ds.Subject",combsub); -
main/trunk/greenstone2/macros/style.dm
r27014 r27018 73 73 <link rel="stylesheet" href="_httpstyle_/style-print.css" type="text/css" 74 74 title="Printer" charset="UTF-8" media="print" _linktagend_ 75 _cssfilelinkextra_ 75 _cssfilelinkextra_ 76 76 } 77 77 … … 96 96 97 97 # separate macro so additional stylesheets (to those included by default) can be specified 98 _cssfilelinke extra_ {}98 _cssfilelinkextra_ {} 99 99 100 100 # Languages that should be displayed right-to-left
Note:
See TracChangeset
for help on using the changeset viewer.