Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'bug_6709' into 3.14-master

Browse source
This commit is contained in:
Jared Camins-Esakov 2013-05-01 06:55:44 -04:00
commit d5f51e8d8d
5 changed files with 1954 additions and 1947 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
koha-tmpl/intranet-tmpl/prog/en/js/xmlControlfield.js
View file

@ -241,7 +241,7 @@ function changeH4Result(form, h4_result, tr_result, pos, value)
var arrEquiv = new Array();
for (var i=0; i < nodeMaterial.length; i++) {
id = nodeMaterial[i].attributes.getNamedItem("id").nodeValue;
name = nodeMaterial[i].attributes.getNamedItem("name").nodeValue;
name = nodeMaterial[i].getElementsByTagName('name')[0].textContent;
arrEquiv[id] = i;
arrSort.push(id);
}
@ -249,7 +249,7 @@ function changeH4Result(form, h4_result, tr_result, pos, value)
var j;
for (var i=0; i < arrSort.length; i++) {
j = arrEquiv[arrSort[i]];
add_option(this.select, arrSort[i] + " - " + nodeMaterial[j].attributes.getNamedItem("name").nodeValue, arrSort[i], (this.idMaterial != "" && arrSort[i] == this.idMaterial)?true:false);
add_option(this.select, arrSort[i] + " - " + nodeMaterial[j].getElementsByTagName('name')[0].textContent, arrSort[i], (this.idMaterial != "" && arrSort[i] == this.idMaterial)?true:false);
}
} else if (this.idMaterial != "") {
for (var i=0; i < this.select.options.length; i++) {
@ -292,16 +292,21 @@ function changeH4Result(form, h4_result, tr_result, pos, value)
var selected;
var index;
var url;
var description;
var name;
while (nodePos != null) {
if (nodePos.nodeType == 1 && nodePos.nodeName == "Position") {
tr = tbody.insertRow(tbody.rows.length);
td = tr.insertCell(tr.cells.length);
pos = nodePos.attributes.getNamedItem("pos").nodeValue;
title = ((nodePos.getAttributeNode("description") || nodePos.hasAttribute("description")) && nodePos.getAttribute("description") != "")?nodePos.attributes.getNamedItem("description").nodeValue:nodePos.attributes.getNamedItem("name").nodeValue;
// description is required by schema
description = nodePos.getElementsByTagName('description')[0].textContent;
name = nodePos.getElementsByTagName('name')[0].textContent
title = ( description != "")?description:name;
try {
url = ((nodePos.getAttributeNode("url") || nodePos.hasAttribute("url")) && nodePos.getAttribute("url") != "" && nodePos.getAttribute("urltext") != "")?"&nbsp;<a href='" + nodePos.attributes.getNamedItem("url").nodeValue + "' target='_blank'>" + nodePos.attributes.getNamedItem("urltext").nodeValue + "</a>":"";
url = ((nodePos.getAttributeNode("url") || nodePos.hasAttribute("url")) && nodePos.getAttribute("url") != "" && nodePos.getElementsByTagName('urltext')[0].textContent != "")?"&nbsp;<a href='" + nodePos.attributes.getNamedItem("url").nodeValue + "' target='_blank'>" + nodePos.getElementsByTagName('urltext')[0].textContent + "</a>":"";
} catch (e) { url = "";}
td.innerHTML = "<label for='" + pos + "' title='" + title + "'>" + pos + " - " + nodePos.attributes.getNamedItem("name").nodeValue + url + "</label>";
td.innerHTML = "<label for='" + pos + "' title='" + title + "'>" + pos + " - " + name + url + "</label>";
td = tr.insertCell(tr.cells.length);
value = returnValuePosFromResult(result, pos);
if ((index = pos.indexOf("-")) > 0) { // Position interval
@ -312,14 +317,16 @@ function changeH4Result(form, h4_result, tr_result, pos, value)
} else {
strInnerHTML = "<select name='f" + pos + "' id='f" + pos + "' style='width:400px' onchange='changeH4Result(document.getElementById(\"" + this.form_id + "\"), document.getElementById(\"" + this.h4_result + "\"), document.getElementById(\"" + this.tr_result + "\"), \"" + pos + "\", this.options[this.selectedIndex].value)' onfocus='changeH4Result(document.getElementById(\"" + this.form_id + "\"), document.getElementById(\"" + this.h4_result + "\"), document.getElementById(\"" + this.tr_result + "\"), \"" + pos + "\", this.options[this.selectedIndex].value)'>";
value = value.replace("#", " ");
if (nodePos.hasChildNodes()) {
if (nodePos.getElementsByTagName("Value").length != 0) {
var nodeValue = nodePos.firstChild;
while (nodeValue != null) {
if (nodeValue.nodeType == 1 && nodeValue.nodeName == "Value" && nodeValue.hasChildNodes()) {
var valNode = nodeValue.firstChild.nodeValue;
var code = nodeValue.attributes.getNamedItem("code").nodeValue;
description = nodeValue.getElementsByTagName('description')[0].textContent;
var valNode = code;
valNode = valNode.replace("#", " ");
selected = (value == valNode)?"selected='selected'":"";
strInnerHTML += "<option value='" + valNode + "' " + selected + ">" + nodeValue.firstChild.nodeValue + " - " + nodeValue.attributes.getNamedItem("description").nodeValue + "</option>";
strInnerHTML += "<option value='" + valNode + "' " + selected + ">" + code + " - " + description + "</option>";
}
nodeValue = nodeValue.nextSibling;
}

1462
koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.xml
View file

File diff suppressed because it is too large Load diff

2388
koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.xml
View file

File diff suppressed because it is too large Load diff

26
koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_CF.xsd
View file

@ -30,11 +30,11 @@
<xs:complexType name="MaterialType">
<xs:sequence minOccurs="1" maxOccurs="unbounded">
<xs:element name="Position" type="PositionType"/>
<xs:element name="name" type="xs:string"/>
<xs:element name="description" type="xs:string"/>
<xs:element name="Position" type="PositionType" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
<xs:attribute name="id" type="idDataType" use="required"/>
<xs:attribute name="name" type="xs:string" use="required"/>
<xs:attribute name="description" type="xs:string" use="required"/>
</xs:complexType>
@ -54,13 +54,13 @@
<xs:complexType name="PositionType">
<xs:sequence minOccurs="0" maxOccurs="unbounded">
<xs:element name="Value" type="ValueType"/>
<xs:element name="urltext" type="xs:string" minOccurs="0"/>
<xs:element name="name" type="xs:string"/>
<xs:element name="description" type="xs:string"/>
<xs:element name="Value" type="ValueType" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
<xs:attribute name="url" type="xs:anyURI"/>
<xs:attribute name="pos" type="posDataType" use="required"/>
<xs:attribute name="url" type="xs:anyURI" use="optional"/>
<xs:attribute name="urltext" type="xs:string" use="optional"/>
<xs:attribute name="name" type="xs:string" use="required"/>
<xs:attribute name="description" type="xs:string" use="required"/>
</xs:complexType>
@ -73,11 +73,11 @@
<xs:complexType name="ValueType">
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute name="description" type="xs:string" />
</xs:extension>
</xs:simpleContent>
<xs:sequence minOccurs="0" maxOccurs="unbounded">
<xs:element name="description" type="xs:string"/>
</xs:sequence>
<xs:attribute name="code" type="xs:string" use="required"/>
</xs:complexType>
</xs:schema>

2
misc/translator/tmpl_process3.pl
View file

@ -236,7 +236,7 @@ usage_error('You must at least specify input and string list filenames.')
if !@in_files || !defined $str_file;
# Type match defaults to *.tt plus *.inc if not specified
$type = "tt|inc|xsl" if !defined($type);
$type = "tt|inc|xsl|xml" if !defined($type);
# Check the inputs for being files or directories
for my $input (@in_files) {