[hive-mrc] r638 committed - Added ability to specific minimum occurrences during indexing

[hive...@googlecode.com]

Revision: 638
Author: craig....@unc.edu
Date: Mon Jun 11 12:25:20 2012
Log: Added ability to specific minimum occurrences during indexing
http://code.google.com/p/hive-mrc/source/detail?r=638

Modified:
/trunk/hive-web/src/org/unc/hive/client/Indexer.java
/trunk/hive-web/src/org/unc/hive/client/IndexerService.java
/trunk/hive-web/src/org/unc/hive/client/IndexerServiceAsync.java
/trunk/hive-web/src/org/unc/hive/server/IndexerServiceImpl.java
/trunk/hive-web/src/org/unc/hive/server/VocabularyService.java

=======================================
--- /trunk/hive-web/src/org/unc/hive/client/Indexer.java Fri May 11
12:40:36 2012
+++ /trunk/hive-web/src/org/unc/hive/client/Indexer.java Mon Jun 11
12:25:20 2012
@@ -52,7 +52,7 @@
import com.google.gwt.user.client.ui.FormPanel.SubmitEvent;
import com.google.gwt.user.client.ui.FlexTable;

-@UrlPatternEntryPoint(value = "indexing.html")
+@UrlPatternEntryPoint(value = "indexing([^.]*).html(\\\\?.*)?")
public class Indexer implements EntryPoint {

private CaptionPanel indexingCaption;
@@ -63,9 +63,11 @@
// vocabularies in client side
private List<String> allVocabulary; // store the name of all vocabularies
// that hive have
+
+ private HIVEMessages messages =
(HIVEMessages)GWT.create(HIVEMessages.class);

private List<ConceptProxy> selectedConcepts;
- private Button startover = new Button("Start Over");
+ private Button startover = new Button(messages.indexer_startOver());
private Button selectedConceptsButton;
private FlowPanel addVocabularyPanel;
private HorizontalPanel configure;
@@ -148,7 +150,7 @@

private void initVocabulariesMenu() {

- this.openNewVocabulary = new Button("Select");
+ this.openNewVocabulary = new Button(messages.indexer_selectButton() );

openNewVocabulary.addClickHandler(new ClickHandler() {
public void onClick(ClickEvent event) {
@@ -213,7 +215,7 @@
}
if (addVocabularyPanel.getWidgetCount() == 0) {
Label msg = new Label(
- "All vocabularies have been selected.");
+ messages.indexer_allVocabsSelected() );
addVocabularyPanel.add(msg);
}
pop.add(addVocabularyPanel);
@@ -233,7 +235,7 @@
uploadPopup = new PopupPanel(false);
uploadPopup.addStyleName("upload-popup");
uploadPopup.setGlassEnabled(true);
- Label uploading = new Label("Uploading...");
+ Label uploading = new Label(messages.indexer_uploadingMessage() );

uploading.setHeight("100%");
uploadPopup.add(uploading);
@@ -244,13 +246,13 @@
indexingSteps = new FlowPanel();
indexingSteps.addStyleName("indexing-steps");
final HTML steps = new HTML(
- "HIVE automatically extracts concepts from a document or URL based on
selected vocabularies. <br>"
- + "<ul><li>Step 1: Select a vocabulary</li>"
- + "<li>Step 2: Upload a document <span style = 'color: #efb81f;
font-weight: bold;'>OR</span> provide the URL for a document</li>"
- + "<li>Step 3: Click Start Processing button</li></ul>");
+ messages.indexer_pageDesc() + "<br>"
+ + "<ul><li>" + messages.indexer_step1() + "</li>"
+ + "<li>" + messages.indexer_step2() + "</li>"
+ + "<li>" + messages.indexer_step3() + "</li></ul>");
indexingSteps.add(steps);

- indexingCaption = new CaptionPanel("HIVE Automatic Concepts Extractor");
+ indexingCaption = new CaptionPanel(messages.indexer_indexerLabel());
indexingCaption.addStyleName("indexing-Caption");
indexingTable = new FlexTable();

@@ -258,7 +260,7 @@
configure.setVerticalAlignment(HasVerticalAlignment.ALIGN_MIDDLE);
SimplePanel configureWrapper = new SimplePanel();
configureWrapper.setStyleName("configure");
- final Label lb1 = new Label("Select vocabulary source ");
+ final Label lb1 = new Label(messages.indexer_selectVocab());
final HTML step1 = new HTML("<img src = './img/step1.png'/>");
HorizontalPanel hp1 = new HorizontalPanel();
hp1.add(step1);
@@ -287,7 +289,7 @@
final FileUpload upload = new FileUpload();
upload.setName("uploadFormElement");
form.add(upload);
- Button uploadButton = new Button("Upload");
+ Button uploadButton = new Button(messages.indexer_uploadButton());
uploadButton.addStyleName("upload-button");
uploadholder.setVerticalAlignment(HasVerticalAlignment.ALIGN_TOP);
uploadholder.setCellVerticalAlignment(uploadButton,
@@ -308,7 +310,7 @@

// Window.alert(path);
if (upload.getFilename().length() == 0) {
- Window.alert("Please choose a file to upload.");
+ Window.alert(messages.indexer_uploadMessage() );
event.cancel();
} else {
uploadPopup.center();
@@ -355,7 +357,7 @@
}
});

- Label lb3 = new Label("Upload a document");
+ Label lb3 = new Label(messages.indexer_uploadLabel());
lb3.addStyleName("label");
HorizontalPanel hp2 = new HorizontalPanel();
final HTML step2 = new HTML("<img src = './img/step2.png'/>");
@@ -372,14 +374,14 @@
HasVerticalAlignment.ALIGN_MIDDLE);

final FlowPanel logoPanel = new FlowPanel();
- Label powered = new Label("Powered by");
+ Label powered = new Label(messages.indexer_poweredBy());
HTML kea = new HTML(
"<a class = 'kea' href='http://www.nzdl.org/Kea/index.html' target
= '_blank'><img src = './img/kea_logo.gif'/></a>",
true);
logoPanel.add(powered);
logoPanel.add(kea);

- HTML lb4 = new HTML("<span>OR</span> Enter the URL", false);
+ HTML lb4 = new HTML(messages.indexer_enterURL(), false);
lb4.addStyleName("or-label");
lb4.addStyleName("label");
indexingTable.setWidget(2, 0, lb4);
@@ -400,13 +402,13 @@
}

final DisclosurePanel advancedPanel = new DisclosurePanel(
- "Show advanced settings");
+ messages.indexer_showAdvancedSettings());

advancedPanel.addCloseHandler(new CloseHandler<DisclosurePanel>() {
@Override
public void onClose(CloseEvent<DisclosurePanel> event) {
advancedPanel.setHeader(new DisclosurePanelHeader(false,
- "Show advanced settings"));
+ messages.indexer_showAdvancedSettings() ));
}
});

@@ -414,7 +416,7 @@
@Override
public void onOpen(OpenEvent<DisclosurePanel> event) {
advancedPanel.setHeader(new DisclosurePanelHeader(true,
- "Hide advanced settings"));
+ messages.indexer_hideAdvancedSettings()));
}
});

@@ -424,14 +426,14 @@
algSel.addItem("KEA");
algSel.addItem("dummy");
Label algSelLbl = new Label();
- algSelLbl.setText(" Indexing algorithm");
+ algSelLbl.setText(" " + messages.indexer_algorithm());
algSelLbl.addStyleName("label");
HorizontalPanel algSelPanel = new HorizontalPanel();
algSelPanel.setStyleName("advanced-subpanel");
algSelPanel.add(algSel);
algSelPanel.add(algSelLbl);
algSelPanel
- .setTitle("Algorithm used when indexing a document or website.");
+ .setTitle(messages.indexer_algorithmDesc());

// Create the max hops listbox and panel
final ListBox maxHops = new ListBox();
@@ -443,15 +445,14 @@
maxHops.addItem("5");
maxHops.setStyleName("max-hops");
Label maxHopsLbl = new Label();
- maxHopsLbl.setText(" Number of hops");
+ maxHopsLbl.setText(" " + messages.indexer_numHops());
maxHopsLbl.addStyleName("label");
HorizontalPanel maxHopsPanel = new HorizontalPanel();
maxHopsPanel.setStyleName("advanced-subpanel");
maxHopsPanel.add(maxHops);
maxHopsPanel.add(maxHopsLbl);
maxHopsPanel
- .setTitle("Maximum number of links to follow when indexing a website. "
- + "Set to 0 to index the first page only. Increasing this value will
increase indexing time.");
+ .setTitle(messages.indexer_numHopsDesc());

// Create max terms listbox and panel
final ListBox maxTerms = new ListBox();
@@ -462,37 +463,53 @@
maxTerms.setItemSelected(1, true);
maxTerms.setStyleName("max-hops");
Label maxTermsLbl = new Label();
- maxTermsLbl.setText(" Maximum number of terms");
+ maxTermsLbl.setText(" " + messages.indexer_numTerms());
maxTermsLbl.addStyleName("label");
HorizontalPanel maxTermsPanel = new HorizontalPanel();
maxTermsPanel.setStyleName("advanced-subpanel");
maxTermsPanel.add(maxTerms);
maxTermsPanel.add(maxTermsLbl);
- maxTermsPanel.setTitle("Maximum number of terms to suggest.");
+ maxTermsPanel.setTitle(messages.indexer_numTermsTip());
+
+ // Create minoccur listbox and panel
+ final ListBox minOccur = new ListBox();
+ minOccur.addItem("1");
+ minOccur.addItem("2");
+ minOccur.setItemSelected(1, true);
+ minOccur.setStyleName("max-hops");
+ Label minOccurLbl = new Label();
+ minOccurLbl.setText(" " + messages.indexer_minOccur());
+ minOccurLbl.addStyleName("label");
+ HorizontalPanel minOccurPanel = new HorizontalPanel();
+ minOccurPanel.setStyleName("advanced-subpanel");
+ minOccurPanel.add(minOccur);
+ minOccurPanel.add(minOccurLbl);
+ minOccurPanel.setTitle(messages.indexer_minOccurTip());
+

final CheckBox diffCb = new CheckBox();
Label diffLbl = new Label();
- diffLbl.setText(" Index differences only");
+ diffLbl.setText(" " + messages.indexer_diffOnly() );
diffLbl.setStyleName("label");
HorizontalPanel diffPanel = new HorizontalPanel();
diffPanel.setStyleName("advanced-subpanel");
diffPanel.add(diffCb);
diffPanel.add(diffLbl);
diffPanel
- .setTitle("Check this checkbox to index only the differences between
multiple pages in a multipage site. "
- + "This will reduce the effect of repeated components such as
headers and menus.");
+ .setTitle(messages.indexer_diffOnlyTip() );

VerticalPanel vp = new VerticalPanel();
vp.add(algSelPanel);
vp.add(maxHopsPanel);
vp.add(maxTermsPanel);
+ vp.add(minOccurPanel);
vp.add(diffPanel);
advancedPanel.add(vp);
advancedPanel.setStyleName("advanced-panel");
advancedPanel.setWidth("300px");
indexingTable.setWidget(3, 1, advancedPanel);

- Button startProcessing = new Button("Start Processing");
+ Button startProcessing = new Button(messages.indexer_startButton());
startProcessing.setStyleName("start-processing");
final HTML step3 = new HTML("<img src = './img/step3.png'/>");
indexingTable.setWidget(0, 2, step3);
@@ -516,9 +533,11 @@
.getSelectedIndex()));
int terms = Integer.parseInt(maxTerms.getValue(maxTerms
.getSelectedIndex()));
+ int minoccur = Integer.parseInt(minOccur.getValue(minOccur
+ .getSelectedIndex()));
boolean diff = diffCb.getValue();
if (openedVocabularies.isEmpty()) {
- Window.alert("Please select at least one vocabulary.");
+ Window.alert(messages.indexer_selectVocabMessage());
} else if (isFileUploaded == true && url.equals("")) {
fileToProcess = tempFileName;
isValid = true;
@@ -530,14 +549,14 @@
fileToProcess = url;
isValid = true;
} else if (isFileUploaded == true && !url.equals("")) {
- Window.alert("You can only upload a document or enter a URL, but not
both.");
+ Window.alert(messages.indexer_uploadOrUrlError());
} else if (isFileUploaded == false && url.equals("")) {
- Window.alert("Please upload a document or enter a URL (use
http://).");
+ Window.alert(messages.indexer_uploadOrUrlMessage());
}

if (isValid == true) {
final PopupPanel processingPopup = new PopupPanel();
- final Label processing = new Label("Processing...");
+ final Label processing = new
Label(messages.indexer_processingMessagej());
processingPopup.addStyleName("z-index");
processingPopup.add(processing);
processingPopup.setGlassEnabled(true);
@@ -545,11 +564,11 @@
processingPopup.show();

indexerService.getTags(fileToProcess, openedVocabularies,
- hops, terms, diff, algorithm,
+ hops, terms, diff, minoccur, algorithm,
new AsyncCallback<List<ConceptProxy>>() {
@Override
public void onFailure(Throwable caught) {
- Window.alert("An error has occurred. Please try again.");
+ Window.alert(messages.indexer_errorMessage());
caught.printStackTrace();
processingPopup.hide();
}
@@ -589,16 +608,14 @@

private void displayResult(List<ConceptProxy> result) {
indexingCaption.clear();
- indexingCaption.setCaptionText("Extracted Concepts Cloud");
+
indexingCaption.setCaptionText(messages.indexer_extractedConceptsLabel());
indexingCaption.removeFromParent();
indexingTable.clear();
resultDock = new DockPanel();
resultDock.addStyleName("result-Dock");

indexingSteps.clear();
- final HTML steps = new HTML(
- "You can select multiple concepts from the cloud and view in the
following formats: "
- + "SKOS RDF/XML, SKOS N triples, Dublin Core, MARC/XML, and
MODS/XML.");
+ final HTML steps = new HTML(messages.indexer_formatDesc());
indexingSteps.add(steps);

startover.addClickHandler(new ClickHandler() {
@@ -613,7 +630,7 @@
});
selectedConceptsButton = new Button("");
selectedConceptsButton
- .setHTML("<html>Select Concepts to<br>View in multiple
formats</html>");
+ .setHTML("<html>" + messages.indexer_selectConcepts() + "</html>");
selectedConceptsButton.setStyleName("selectedConceptsButton");
selectedConceptsButton.addClickHandler(new FormatRecordsHandler());

@@ -722,20 +739,18 @@
super(autohide, modal);
associateVoc = vocabulary;
vocIndex = openedVocabularies.indexOf(associateVoc.toLowerCase());
- this.setText("Confirm");
+ this.setText(messages.indexer_confirm() );
this.setAnimationEnabled(true);
com.google.gwt.user.client.ui.Button yesBtn = new
com.google.gwt.user.client.ui.Button(
- "Yes");
+ messages.indexer_yes() );
com.google.gwt.user.client.ui.Button cancelBtn = new
com.google.gwt.user.client.ui.Button(
- "Cancel");
+ messages.indexer_cancel());
VerticalPanel vp = new VerticalPanel();
vp.setVerticalAlignment(HasVerticalAlignment.ALIGN_MIDDLE);
vp.setHorizontalAlignment(HasHorizontalAlignment.ALIGN_CENTER);
vp.setSpacing(10);
vp.setSize("100%", "100%");
- HTML msg = new HTML(
- "Do you really want to close <span style = 'color: #3399FF'>"
- + associateVoc + "</span>?", true);
+ HTML msg = new HTML(messages.indexer_doYouReally(associateVoc), true);
vp.add(msg);
yesBtn.addClickHandler(new ClickHandler() {
public void onClick(ClickEvent e) {
@@ -863,7 +878,7 @@

public void onClick(ClickEvent event) {
if (selectedConcepts.isEmpty()) {
- Window.alert("Please select at least one concept.");
+ Window.alert(messages.indexer_selectConceptMessage());
return;
}

@@ -873,7 +888,7 @@
formatRecDlg.setGlassEnabled(true);
formatRecDlg.addStyleName("recordformat-panel");
FlowPanel hdr = new FlowPanel();
- Label lb = new Label("Select Format:");
+ Label lb = new Label(messages.indexer_selectFormat());
lb.addStyleName("heading");
lb.addStyleName("format-label");

@@ -881,11 +896,11 @@
recs.setValue("");

final ListBox formatList = new ListBox();
- formatList.addItem("SKOS - RDF/XML");
- formatList.addItem("SKOS - N Triples");
- formatList.addItem("Dublin Core");
- formatList.addItem("MODS/XML");
- formatList.addItem("MARC/XML");
+ formatList.addItem(messages.indexer_formatSkos());
+ formatList.addItem(messages.indexer_formatNT() );
+ formatList.addItem(messages.indexer_formatDC());
+ formatList.addItem(messages.indexer_foramtMODS());
+ formatList.addItem(messages.indexer_formatMARC());
formatList.setVisibleItemCount(1);
formatList.setSelectedIndex(0);
formatList.addStyleName("format-listbox");
@@ -902,7 +917,7 @@
});

// default record format is SKOS RDF/XML
- recText = formatter.format(selectedConcepts, "SKOS - RDF/XML");
+ recText = formatter.format(selectedConcepts,
messages.indexer_formatSkos() );
recs.setValue(recText);

PushButton closeButton = new PushButton(new Image(
@@ -940,7 +955,7 @@
Label htext = new Label(result.getOrigin() + "->"
+ result.getPreLabel());
htext.addStyleName("concept-name-style");
- Button showSKOSBtn = new Button("View in SKOS");
+ Button showSKOSBtn = new Button(messages.indexer_viewSKOS());
showSKOSBtn.setStyleName("skos-btn");
showSKOSBtn.addClickHandler(new SKOSHandler(result.getSkosCode()));
header.addStyleName("concept-name-header");
@@ -954,23 +969,23 @@
vp.add(header);
Label preLabel = new Label(result.getPreLabel());
FlexTable conceptTable = new FlexTable();
- conceptTable.setText(0, 0, "Preferred Label");
+ conceptTable.setText(0, 0, messages.indexer_prefLabel());
conceptTable.setWidget(0, 1, preLabel);
- conceptTable.setText(1, 0, "URI");
+ conceptTable.setText(1, 0, messages.indexer_uri());
conceptTable.setText(1, 1, result.getURI());
List<String> altLabel = result.getAltLabel();
- conceptTable.setText(2, 0, "Alternative Label");
+ conceptTable.setText(2, 0, messages.indexer_altLabel() );
String altlabels = "";
if (altLabel != null) {
for (String c : altLabel) {
altlabels = altlabels + c + "; ";
}
} else {
- altlabels = "This concept does not have alternative labels.";
+ altlabels = messages.indexer_noAltLabels();
}
conceptTable.setText(2, 1, altlabels);
HashMap<String, String> broader = result.getBroader();
- conceptTable.setText(3, 0, "Broader Concepts");
+ conceptTable.setText(3, 0, messages.indexer_broaderConcepts() );
if (broader != null) {
FlowPanel broaderPanel = new FlowPanel();
Set<String> keys = broader.keySet();
@@ -991,10 +1006,10 @@
conceptTable.setWidget(3, 1, broaderPanel);
} else {
conceptTable.setText(3, 1,
- "This concept does not have broader terms.");
+ messages.indexer_noBroaders());
}

- conceptTable.setText(4, 0, "Narrower Concepts");
+ conceptTable.setText(4, 0, messages.indexer_narrowerConcepts());
HashMap<String, String> narrower = result.getNarrower();
if (narrower != null) {
FlowPanel narrowerPanel = new FlowPanel();
@@ -1014,11 +1029,11 @@
conceptTable.setWidget(4, 1, narrowerPanel);
} else {
conceptTable.setText(4, 1,
- "This concept does not have narrower terms.");
+ messages.indexer_narrowers());
}

HashMap<String, String> related = result.getRelated();
- conceptTable.setText(5, 0, "Related Concepts");
+ conceptTable.setText(5, 0, messages.indexer_relatedConcepts());
if (related != null) {
FlowPanel relatedPanel = new FlowPanel();
Set<String> keys = related.keySet();
@@ -1036,11 +1051,11 @@
}
} else {
conceptTable.setText(5, 1,
- "This concept does not have related concepts.");
+ messages.indexer_noRelateds());
}

List<String> scopeNotes = result.getScopeNotes();
- conceptTable.setText(6, 0, "Scope Notes");
+ conceptTable.setText(6, 0, messages.indexer_scopeNotes());
String sn = "";
if (scopeNotes != null) {
for (String s : scopeNotes) {
@@ -1048,7 +1063,7 @@
}

} else {
- sn = "This concept does not have scope notes.";
+ sn = messages.indexer_noScopeNotes() ;
}

conceptTable.setText(6, 1, sn);
@@ -1084,16 +1099,16 @@
}
}
}
- String numConcepts = "Select Concepts to ";
+ String numConcepts = messages.indexer_selectConcepts() + " ";
if (!selectedConcepts.isEmpty()) {
numberOfSelectedConcepts = selectedConcepts.size();
numConcepts = String.valueOf(numberOfSelectedConcepts);
numConcepts = numConcepts
- + ((numberOfSelectedConcepts == 1) ? " Concept Selected"
- : " Concepts Selected");
+ + ((numberOfSelectedConcepts == 1) ? " " +
messages.indexer_conceptSelected()
+ : " " + messages.indexer_conceptsSelected());
}
numConcepts = "<html>" + numConcepts + "<br>"
- + "View in multiple formats" + "</html>";
+ + messages.indexer_viewMultipleFormats() + "</html>";
selectedConceptsButton.setHTML(numConcepts);
}
}
=======================================
--- /trunk/hive-web/src/org/unc/hive/client/IndexerService.java Fri May 11
12:40:36 2012
+++ /trunk/hive-web/src/org/unc/hive/client/IndexerService.java Mon Jun 11
12:25:20 2012
@@ -8,6 +8,6 @@
public interface IndexerService extends RemoteService {

public List<ConceptProxy> getTags(String input, List<String>
openedVocabularies, int maxHops, int numTerms,
- boolean diffOnly, String algorithm);
+ boolean diffOnly, int minOccur, String algorithm);

}
=======================================
--- /trunk/hive-web/src/org/unc/hive/client/IndexerServiceAsync.java Fri
May 11 12:40:36 2012
+++ /trunk/hive-web/src/org/unc/hive/client/IndexerServiceAsync.java Mon
Jun 11 12:25:20 2012
@@ -7,6 +7,7 @@
public interface IndexerServiceAsync {

public void getTags(String input, List<String> openedVocabularies, int
maxHops,
- int numTerms, boolean diffOnly, String algorithm,
AsyncCallback<List<ConceptProxy>> callback);
+ int numTerms, boolean diffOnly, int minOccur, String algorithm,
+ AsyncCallback<List<ConceptProxy>> callback);

}
=======================================
--- /trunk/hive-web/src/org/unc/hive/server/IndexerServiceImpl.java Fri May
11 12:40:36 2012
+++ /trunk/hive-web/src/org/unc/hive/server/IndexerServiceImpl.java Mon Jun
11 12:25:20 2012
@@ -52,7 +52,7 @@
*
*/
public List<ConceptProxy> getTags(String input, List<String>
openedVocabularies, int maxHops,
- int numTerms, boolean diff, String algorithm)
+ int numTerms, boolean diff, int minOccur, String algorithm)
{
logger.debug("getTags for " + input);

@@ -60,7 +60,7 @@
try
{
URL url = new URL (input);
- return this.service.getTags(url, openedVocabularies, maxHops,
numTerms, diff, algorithm);
+ return this.service.getTags(url, openedVocabularies, maxHops,
numTerms, diff, minOccur, algorithm);

} catch (Exception e) {
e.printStackTrace();
@@ -72,7 +72,7 @@
String filePath = this.path + "/WEB-INF/tmp/" + input;

List<ConceptProxy> concepts = new ArrayList<ConceptProxy>();
- concepts = this.service.getTags(filePath, openedVocabularies, numTerms,
algorithm);
+ concepts = this.service.getTags(filePath, openedVocabularies, numTerms,
minOccur, algorithm);

// Delete the temporary file
File file = new File(filePath);
=======================================
--- /trunk/hive-web/src/org/unc/hive/server/VocabularyService.java Fri May
11 12:40:36 2012
+++ /trunk/hive-web/src/org/unc/hive/server/VocabularyService.java Mon Jun
11 12:25:20 2012
@@ -38,6 +38,7 @@
private static final Log logger =
LogFactory.getLog(VocabularyService.class); //jpb
private static VocabularyService instance = null;
private SKOSServer skosServer;
+ private int DEFAULT_MIN_OCCUR = 2;

protected VocabularyService(String configFile) {
this.skosServer = new SKOSServerImpl(configFile);
@@ -310,7 +311,7 @@

SKOSTagger tagger = this.skosServer.getSKOSTagger(algorithm);
List<SKOSConcept> candidates = tagger.getTags(input, openedVocabularies,
- this.getSKOSSearcher(), numTerms);
+ this.getSKOSSearcher(), numTerms, DEFAULT_MIN_OCCUR);
List<ConceptProxy> result = new ArrayList<ConceptProxy>();
for(SKOSConcept concept : candidates)
{
@@ -333,7 +334,7 @@
int numTerms, int minPhraseOccur, String algorithm)
{
SKOSTagger tagger = this.skosServer.getSKOSTagger(algorithm);
- List<SKOSConcept> candidates = tagger.getTagsFromText(input,
openedVocabularies,
+ List<SKOSConcept> candidates = tagger.getTags(input, openedVocabularies,
this.getSKOSSearcher(), numTerms, minPhraseOccur);
List<ConceptProxy> result = new ArrayList<ConceptProxy>();
for(SKOSConcept concept : candidates)
@@ -371,11 +372,11 @@
}

public List<ConceptProxy> getTags(URL url, List<String>
openedVocabularies, int maxHops,
- int numTerms, boolean diff, String algorithm)
+ int numTerms, boolean diff, int minOccur, String algorithm)
{
SKOSTagger tagger = this.skosServer.getSKOSTagger(algorithm);
List<SKOSConcept> candidates = tagger.getTags(url, openedVocabularies,
- this.getSKOSSearcher(), maxHops, numTerms, diff);
+ this.getSKOSSearcher(), maxHops, numTerms, diff, minOccur);
List<ConceptProxy> result = new ArrayList<ConceptProxy>();
for(SKOSConcept concept : candidates)
{