Attachment #195192 for bug #319907

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Lines 10-15 Link Here

(-)src/org/eclipse/help/internal/webapp/parser/ParseElement.java (+7 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.help.internal.webapp.parser;	11	package org.eclipse.help.internal.webapp.parser;
12		12
		13	import java.io.UnsupportedEncodingException;
		14	import java.net.URLEncoder;
13	import java.util.ArrayList;	15	import java.util.ArrayList;
14	import java.util.Enumeration;	16	import java.util.Enumeration;
15	import java.util.Properties;	17	import java.util.Properties;
Lines 81-86 Link Here
81	buff.append(JSonHelper.NEWLINE + space + JSonHelper.SPACE);	83	buff.append(JSonHelper.NEWLINE + space + JSonHelper.SPACE);
82	buff.append(key);	84	buff.append(key);
83	buff.append(JSonHelper.COLON);	85	buff.append(JSonHelper.COLON);
		86	try {
		87	val = URLEncoder.encode(val, "UTF-8"); //$NON-NLS-1$
		88	} catch (UnsupportedEncodingException e) {
		89	e.printStackTrace();
		90	}
84	buff.append(JSonHelper.getQuotes(val));	91	buff.append(JSonHelper.getQuotes(val));
85	buff.append(JSonHelper.COMMA);	92	buff.append(JSonHelper.COMMA);
86	}	93	}

Lines 45-50 Link Here

(-)src/org/eclipse/help/internal/webapp/parser/ResultParser.java (+4 lines)
45	parser.parse(in, this);	45	parser.parse(in, this);
46	}	46	}
47		47
		48	public void setLabel(String label) {
		49	this.label = label;
		50	}
		51
48	public ArrayList getItems()	52	public ArrayList getItems()
49	{	53	{
50	return items;	54	return items;




	public void startElement(String uri, 
			String lname, String name, Attributes attrs) {
		
		if (name.equalsIgnoreCase(XMLHelper.ELEMENT_NODE) 
				|| name.equalsIgnoreCase(XMLHelper.ELEMENT_NUMERIC_PATH)) {
			
			tagLevel++;
			
			if (tagLevel == level) {
				properties = new Properties();
				if (name.equalsIgnoreCase(XMLHelper.ELEMENT_NUMERIC_PATH)) {
					setLabel(""); //$NON-NLS-1$
					properties.put(JSonHelper.PROPERTY_NAME, JSonHelper.NUMERIC_PATH);
				}
				else
					properties.put(JSonHelper.PROPERTY_NAME, JSonHelper.TOPIC);
				
				for (int i = 0; i < attrs.getLength(); i++) {
					String qname = attrs.getQName(i);
					String val = attrs.getValue(i);


	public void endElement(String uri, String lname, String name) {

		if (name.equalsIgnoreCase(XMLHelper.ELEMENT_NODE) 
				|| name.equalsIgnoreCase(XMLHelper.ELEMENT_NUMERIC_PATH))
		{
			if (tagLevel == level && properties != null ) {
				
				if (name.equalsIgnoreCase(XMLHelper.ELEMENT_NUMERIC_PATH)) {
					properties.setProperty("id", "0"); //$NON-NLS-1$ //$NON-NLS-2$
					properties.setProperty("type", "topic"); //$NON-NLS-1$ //$NON-NLS-2$
				}
				else
					properties.setProperty("type", "toc"); //$NON-NLS-1$ //$NON-NLS-2$
				
				ParseElement element = new ParseElement(properties);
				items.add(element);

Lines 48-53 Link Here

(-)src/org/eclipse/help/internal/webapp/utils/JSonHelper.java (+1 lines)
48	public static final String PROPERTY_NAME = "propertyName"; //$NON-NLS-1$	48	public static final String PROPERTY_NAME = "propertyName"; //$NON-NLS-1$
49	public static final String INDEX = "Index"; //$NON-NLS-1$	49	public static final String INDEX = "Index"; //$NON-NLS-1$
50	public static final String TOPIC = "Topic"; //$NON-NLS-1$	50	public static final String TOPIC = "Topic"; //$NON-NLS-1$
		51	public static final String NUMERIC_PATH = "NumericPath"; //$NON-NLS-1$
51		52
52	public static String getQuotes(String str){	53	public static String getQuotes(String str){
53	return ((str != null)?QUOTE + str + QUOTE:""); //$NON-NLS-1$	54	return ((str != null)?QUOTE + str + QUOTE:""); //$NON-NLS-1$

Lines 36-41 Link Here

(-)src/org/eclipse/help/internal/webapp/utils/XMLHelper.java (+1 lines)
36	public static final String ELEMENT_INDEX = "index"; //$NON-NLS-1$	36	public static final String ELEMENT_INDEX = "index"; //$NON-NLS-1$
37	public static final String ELEMENT_INDEX_CONTRIBUTIONS = "indexContributions"; //$NON-NLS-1$	37	public static final String ELEMENT_INDEX_CONTRIBUTIONS = "indexContributions"; //$NON-NLS-1$
38	public static final String ELEMENT_TOC_CONTRIBUTIONS = "tocContributions"; //$NON-NLS-1$	38	public static final String ELEMENT_TOC_CONTRIBUTIONS = "tocContributions"; //$NON-NLS-1$
		39	public static final String ELEMENT_NUMERIC_PATH = "numeric_path"; //$NON-NLS-1$
39		40
40	public static final String CATEGORY_HREF = "categoryHref"; //$NON-NLS-1$	41	public static final String CATEGORY_HREF = "categoryHref"; //$NON-NLS-1$
41	}	42	}

Return to bug 319907

Lines 49-61 Link Here

(-)src/org/eclipse/help/internal/webapp/parser/TocFragmentParser.java (-5 / +18 lines)
49	public void startElement(String uri,	49	public void startElement(String uri,
50	String lname, String name, Attributes attrs) {	50	String lname, String name, Attributes attrs) {
51		51
52	if (name.equalsIgnoreCase(XMLHelper.ELEMENT_NODE))	52	if (name.equalsIgnoreCase(XMLHelper.ELEMENT_NODE)
53	{	53	\|\| name.equalsIgnoreCase(XMLHelper.ELEMENT_NUMERIC_PATH)) {
		54
54	tagLevel++;	55	tagLevel++;
55		56
56	if (tagLevel == level) {	57	if (tagLevel == level) {
57	properties = new Properties();	58	properties = new Properties();
58	properties.put(JSonHelper.PROPERTY_NAME, JSonHelper.TOPIC);	59	if (name.equalsIgnoreCase(XMLHelper.ELEMENT_NUMERIC_PATH)) {
		60	setLabel(""); //$NON-NLS-1$
		61	properties.put(JSonHelper.PROPERTY_NAME, JSonHelper.NUMERIC_PATH);
		62	}
		63	else
		64	properties.put(JSonHelper.PROPERTY_NAME, JSonHelper.TOPIC);
		65
59	for (int i = 0; i < attrs.getLength(); i++) {	66	for (int i = 0; i < attrs.getLength(); i++) {
60	String qname = attrs.getQName(i);	67	String qname = attrs.getQName(i);
61	String val = attrs.getValue(i);	68	String val = attrs.getValue(i);
Lines 76-86 Link Here
76		83
77	public void endElement(String uri, String lname, String name) {	84	public void endElement(String uri, String lname, String name) {
78		85
79	if (name.equalsIgnoreCase(XMLHelper.ELEMENT_NODE))	86	if (name.equalsIgnoreCase(XMLHelper.ELEMENT_NODE)
		87	\|\| name.equalsIgnoreCase(XMLHelper.ELEMENT_NUMERIC_PATH))
80	{	88	{
81	if (tagLevel == level && properties != null ) {	89	if (tagLevel == level && properties != null ) {
82		90
83	properties.setProperty("type", "toc"); //$NON-NLS-1$ //$NON-NLS-2$	91	if (name.equalsIgnoreCase(XMLHelper.ELEMENT_NUMERIC_PATH)) {
		92	properties.setProperty("id", "0"); //$NON-NLS-1$ //$NON-NLS-2$
		93	properties.setProperty("type", "topic"); //$NON-NLS-1$ //$NON-NLS-2$
		94	}
		95	else
		96	properties.setProperty("type", "toc"); //$NON-NLS-1$ //$NON-NLS-2$
84		97
85	ParseElement element = new ParseElement(properties);	98	ParseElement element = new ParseElement(properties);
86	items.add(element);	99	items.add(element);