Project

General

Profile

« Previous | Next » 

Revision 4359

Added by daigle almost 16 years ago

Fix workgroup description

View differences:

lib/style/skins/sanparks/sanparks.properties.metadata.xml
19 19
	</config>
20 20

  
21 21
	<config>
22
	<!-- TODO MCD what the heck is wg? -->
23 22
		<key>registry.show.wgList</key>
24
		<label>Show WG List</label>
23
		<label>Show Work Group List</label>
25 24
		<group>1</group>
26 25
		<index>2</index>
27 26
		<fieldType>checkbox</fieldType>
28
		<description>Show the wg list in the registry.</description>
27
		<description>Show the work group list in the registry.</description>
29 28
		<helpFile>properties.html#registry.show.wgList</helpFile>
30 29
	</config>
31 30

  
32 31
	<config>
33 32
		<key>registry.show.organization</key>
34
		<label>Show WG List</label>
33
		<label>Show Organization List</label>
35 34
		<group>1</group>
36 35
		<index>3</index>
37 36
		<fieldType>checkbox</fieldType>
lib/style/skins/default/default.properties.metadata.xml
19 19
	</config>
20 20

  
21 21
	<config>
22
	<!-- TODO MCD what the heck is wg? -->
23 22
		<key>registry.show.wgList</key>
24 23
		<label>Show Work Group List</label>
25 24
		<group>1</group>
lib/style/skins/nceas/nceas.properties.metadata.xml
44 44
	</config>
45 45

  
46 46
	<config>
47
	<!-- TODO MCD what the heck is wg? -->
48 47
		<key>registry.show.wgList</key>
49
		<label>Show WG List</label>
48
		<label>Show Work Group List</label>
50 49
		<group>1</group>
51 50
		<index>5</index>
52 51
		<fieldType>checkbox</fieldType>
53
		<description>Show the wg list in the registry.</description>
52
		<description>Show the work group list in the registry.</description>
54 53
		<helpFile>properties.html#registry.show.wgList</helpFile>
55 54
	</config>
56 55

  
57 56
	<config>
58 57
		<key>registry.show.organization</key>
59
		<label>Show WG List</label>
58
		<label>Show Organization List</label>
60 59
		<group>1</group>
61 60
		<index>6</index>
62 61
		<fieldType>checkbox</fieldType>
lib/style/skins/obfs/obfs.properties.metadata.xml
19 19
	</config>
20 20

  
21 21
	<config>
22
	<!-- TODO MCD what the heck is wg? -->
23 22
		<key>registry.show.wgList</key>
24
		<label>Show WG List</label>
23
		<label>Show Work Group List</label>
25 24
		<group>1</group>
26 25
		<index>2</index>
27 26
		<fieldType>checkbox</fieldType>
28
		<description>Show the wg list in the registry.</description>
27
		<description>Show the work group list in the registry.</description>
29 28
		<helpFile>properties.html#registry.show.wgList</helpFile>
30 29
	</config>
31 30

  
32 31
	<config>
33 32
		<key>registry.show.organization</key>
34
		<label>Show WG List</label>
33
		<label>Show Organization List</label>
35 34
		<group>1</group>
36 35
		<index>3</index>
37 36
		<fieldType>checkbox</fieldType>
lib/style/skins/nrs/nrs.properties.metadata.xml
19 19
	</config>
20 20

  
21 21
	<config>
22
	<!-- TODO MCD what the heck is wg? -->
23 22
		<key>registry.show.wgList</key>
24
		<label>Show WG List</label>
23
		<label>Show Work Group List</label>
25 24
		<group>1</group>
26 25
		<index>2</index>
27 26
		<fieldType>checkbox</fieldType>
28
		<description>Show the wg list in the registry.</description>
27
		<description>Show the work group list in the registry.</description>
29 28
		<helpFile>properties.html#registry.show.wgList</helpFile>
30 29
	</config>
31 30

  
32 31
	<config>
33 32
		<key>registry.show.organization</key>
34
		<label>Show WG List</label>
33
		<label>Show Organization List</label>
35 34
		<group>1</group>
36 35
		<index>3</index>
37 36
		<fieldType>checkbox</fieldType>
lib/style/skins/esa/esa.properties.metadata.xml
19 19
	</config>
20 20

  
21 21
	<config>
22
	<!-- TODO MCD what the heck is wg? -->
23 22
		<key>registry.show.wgList</key>
24 23
		<label>Show Work Group List</label>
25 24
		<group>1</group>
26 25
		<index>2</index>
27 26
		<fieldType>checkbox</fieldType>
28
		<description>Show the wg list in the registry.</description>
27
		<description>Show the work group list in the registry.</description>
29 28
		<helpFile>properties.html#registry.show.wgList</helpFile>
30 29
	</config>
31 30

  
lib/style/skins/knb/knb.properties.metadata.xml
19 19
	</config>
20 20

  
21 21
	<config>
22
	<!-- TODO MCD what the heck is wg? -->
23 22
		<key>registry.show.wgList</key>
24
		<label>Show WG List</label>
23
		<label>Show Work Group List</label>
25 24
		<group>1</group>
26 25
		<index>2</index>
27 26
		<fieldType>checkbox</fieldType>
28
		<description>Show the wg list in the registry.</description>
27
		<description>Show the work group list in the registry.</description>
29 28
		<helpFile>properties.html#registry.show.wgList</helpFile>
30 29
	</config>
31 30

  
32 31
	<config>
33 32
		<key>registry.show.organization</key>
34
		<label>Show WG List</label>
33
		<label>Show Organization List</label>
35 34
		<group>1</group>
36 35
		<index>3</index>
37 36
		<fieldType>checkbox</fieldType>
src/edu/ucsb/nceas/metacat/DocumentImpl.java
59 59
import edu.ucsb.nceas.metacat.util.LDAPUtil;
60 60
import edu.ucsb.nceas.metacat.util.MetaCatUtil;
61 61
import edu.ucsb.nceas.metacat.util.SystemUtil;
62
import edu.ucsb.nceas.utilities.FileUtil;
62 63
import edu.ucsb.nceas.utilities.PropertyNotFoundException;
63 64

  
64 65
import org.apache.log4j.Logger;
......
1319 1320
		String xmlFileLine;
1320 1321
		String xmlFileContents = "";
1321 1322
		
1322
		try {
1323
			// read the file from disk
1324
			FileReader fileReader = new FileReader(documentPath);
1325
			BufferedReader br = new BufferedReader(fileReader);
1326
			while ((xmlFileLine = br.readLine()) != null) {
1327
				xmlFileContents += xmlFileLine;
1328
			}
1323
		try {			
1324
			xmlFileContents = FileUtil.readFileToString(documentPath);
1329 1325
            
1330 1326
			// get a list of inline data sections that are not readable
1331 1327
			// by this user
......
1369 1365
	 */
1370 1366
    private String stripInlineData(String xmlFileContents, String inLineKey) {
1371 1367
    	String changedString = xmlFileContents;
1372
    	String regex = "(<distribution .*id=\"" + inLineKey + "\">.*)<inline>.*</inline>(.*<\\distribution>)";
1368
    	String regex = "(<distribution .*id=\"" + inLineKey + "\">.*)<inline>.*</inline>(.*</distribution>)";
1373 1369
    	Pattern pattern = Pattern.compile(regex, Pattern.CASE_INSENSITIVE); 
1374 1370
    	Matcher matcher = pattern.matcher(xmlFileContents);
1375 1371
    	if (matcher.find()) {

Also available in: Unified diff