diff options
Diffstat (limited to '')
3 files changed, 40 insertions, 47 deletions
diff --git a/branches/sca-java-1.x/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/Searcher.java b/branches/sca-java-1.x/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/Searcher.java index f2701c1f73..78b571df7e 100644 --- a/branches/sca-java-1.x/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/Searcher.java +++ b/branches/sca-java-1.x/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/Searcher.java @@ -393,21 +393,20 @@ public class Searcher implements ItemCollection, LocalItemCollection { this.elementCounter++; writer.write("<div style='margin-top:0em;margin-left:"); writer.write(Integer.toString(indentation)); - writer - .write("em;background-color:#FFE175;max-width:100%;border-style:dashed;border-width:1px;padding:5px'>" + "<p style='margin:0px;padding:0px;font-size:70%'>" - + "<a style='margin:0px;padding:0px' href='#filecontent"); + writer.write("em;background-color:#FFE175;max-width:100%;border-style:dashed;border-width:1px;padding:5px'>"); + writer.write("<p style='margin:0px;padding:0px;font-size:70%'>"); + //+ "<a style='margin:0px;padding:0px' href='#filecontent"); + //writer.write(Integer.toString(this.elementCounter)); - writer.write(Integer.toString(this.elementCounter)); - - String contributionPlusArtifact = - getContributionURI(result) + ";" + removeHighlighting(result.getContainer().getValue()); + String contributionPlusArtifact = getContributionURI(result) + ";" + removeHighlighting(result.getContainer().getValue()); // writer.write("' onclick='search"); // writer.write("'>view all</a> <a href='/files/contribution="); - writer.write("' onclick='getHighlighted(\""); + writer.write("<a style='margin:0px;padding:0px' href='javascript:document.getElementByID(\"searchGadget\").contentWindow.getHighlighted(\""); writer.write(contributionPlusArtifact); - writer.write("\")'>view all</a> <a href='/files/contribution="); - + writer.write("\");'>view all</a> "); + + writer.write("<a href='/files/contribution="); writer.write(contributionPlusArtifact); writer.write("'>download</a></p><p style='margin:8px 0px 0px 0px;padding:0px'>"); @@ -418,7 +417,8 @@ public class Searcher implements ItemCollection, LocalItemCollection { i += MAX_CONTENT_LINE_WIDTH; } - writer.write("</p></div>"); + writer.write("</p>"); + writer.write("</div>"); } diff --git a/branches/sca-java-1.x/modules/domain-manager/src/main/resources/search-gadget.html b/branches/sca-java-1.x/modules/domain-manager/src/main/resources/search-gadget.html index 565a2bd77e..49737a0ae5 100644 --- a/branches/sca-java-1.x/modules/domain-manager/src/main/resources/search-gadget.html +++ b/branches/sca-java-1.x/modules/domain-manager/src/main/resources/search-gadget.html @@ -27,49 +27,15 @@ <link rel="stylesheet" type="text/css" href="manager.css"> -<script type="text/javascript"> - - function search() { - lastQuery = elementByID(gadget, 'searchField').value; - searcher.get("query" + lastQuery, searchResponse); - - } - - function getHighlighted(artifact) { - searcher.get("highlight" + lastQuery + ";" + artifact, searchResponse); - } - - function highlightResponse(feed) { - var entries = feed.getElementsByTagName("entry"); - var content = entries[0].getElementsByTagName("content"); - - var results = elementByID(gadget, "results"); - results.innerHTML = content[0].firstChild.data; - - } - - function searchResponse(feed) { - var entries = feed.getElementsByTagName("entry"); - var content = entries[0].getElementsByTagName("content"); - - var results = elementByID(gadget, "results"); - results.innerHTML = content[0].firstChild.data; - - } - -</script> - </head> <body> - - <div id="domainSearch"> <form id="domainSearchForm"> <p style="margin-top:1em;margin-bottom:1em;margin-left:1em;margin-right:1em"> - <input id="searchField" type="text" value="" /> <input id="searchButton" type="submit" value="Search" onclick="search()" /> + <input id="searchField" type="text" value="" /> <input id="searchButton" type="button" value="Search" onclick="search()" /> </p> <br> @@ -89,6 +55,33 @@ var lastQuery = ""; elementByID(gadget, 'searchButton').onclick = search; + + + function search() { + lastQuery = elementByID(gadget, 'searchField').value; + searcher.get("query" + lastQuery, searchResponse); + } + + function getHighlighted(artifact) { + searcher.get("highlight" + lastQuery + ";" + artifact, searchResponse); + } + + function highlightResponse(feed) { + var entries = feed.getElementsByTagName("entry"); + var content = entries[0].getElementsByTagName("content"); + + var results = elementByID(gadget, "results"); + results.innerHTML = content[0].firstChild.data; + } + + function searchResponse(feed) { + alert("processing results"); + var entries = feed.getElementsByTagName("entry"); + var content = entries[0].getElementsByTagName("content"); + + var results = elementByID(gadget, "results"); + results.innerHTML = content[0].firstChild.data; + } </script> diff --git a/branches/sca-java-1.x/modules/domain-manager/src/main/resources/search.html b/branches/sca-java-1.x/modules/domain-manager/src/main/resources/search.html index 52309f3256..9bd80a6349 100644 --- a/branches/sca-java-1.x/modules/domain-manager/src/main/resources/search.html +++ b/branches/sca-java-1.x/modules/domain-manager/src/main/resources/search.html @@ -40,7 +40,7 @@ </p> <iframe id="toolbarGadget" src="toolbar-gadget.html"></iframe> - <iframe id="searchGadget" src="search-gadget.html"marginwidth="0" marginheight="0" frameborder="0" scrolling="no"></iframe> + <iframe id="searchGadget" src="search-gadget.html" marginwidth="0" marginheight="0" frameborder="0" scrolling="no"></iframe> </body> <script type="text/javascript"> |