Skip to content

Commit 36c5fe8

Browse files
committed
Disable download extracted text when OCR failed
1 parent 001fdbc commit 36c5fe8

File tree

2 files changed

+12
-53
lines changed

2 files changed

+12
-53
lines changed

logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/settings/OCRHistoryPanel.java

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,11 @@ else if (val.toString().contains("ocr.failure"))
7979

8080
FileNameListGridField fileName = new FileNameListGridField();
8181
fileName.setAutoFitWidth(true);
82-
82+
8383
ColoredListGridField path = new ColoredListGridField("path", I18N.message("path"));
8484
path.setCanFilter(true);
8585
path.setWidth(300);
86-
86+
8787
final RefreshableListGrid list = new RefreshableListGrid();
8888
list.setEmptyMessage(I18N.message("notitemstoshow"));
8989
list.setCanFreezeFields(true);
@@ -106,23 +106,22 @@ else if (val.toString().contains("ocr.failure"))
106106

107107
list.addCellContextClickHandler(e -> {
108108
Menu contextMenu = new Menu();
109+
Record selectedRecord = list.getSelectedRecord();
109110

110111
MenuItem openInFolder = new MenuItem();
111112
openInFolder.setTitle(I18N.message("openinfolder"));
112113
openInFolder.addClickHandler(evnt -> {
113-
Record rec = list.getSelectedRecord();
114-
DocumentsPanel.get().openInFolder(Long.parseLong(rec.getAttributeAsString(DOC_ID)));
114+
DocumentsPanel.get().openInFolder(Long.parseLong(selectedRecord.getAttributeAsString(DOC_ID)));
115115
});
116116

117117
MenuItem preview = new MenuItem();
118118
preview.setTitle(I18N.message("preview"));
119119
preview.addClickHandler(evnt -> {
120-
Record rec = list.getSelectedRecord();
121120
GUIDocument doc = new GUIDocument();
122-
doc.setId(rec.getAttributeAsLong(DOC_ID));
123-
doc.setFileName(rec.getAttributeAsString("filename"));
121+
doc.setId(selectedRecord.getAttributeAsLong(DOC_ID));
122+
doc.setFileName(selectedRecord.getAttributeAsString("filename"));
124123

125-
GUIFolder folder = new GUIFolder(rec.getAttributeAsLong("folderId"));
124+
GUIFolder folder = new GUIFolder(selectedRecord.getAttributeAsLong("folderId"));
126125
doc.setFolder(folder);
127126

128127
PreviewPopup iv = new PreviewPopup(doc);
@@ -134,9 +133,8 @@ else if (val.toString().contains("ocr.failure"))
134133
MenuItem downloadIndexed = new MenuItem();
135134
downloadIndexed.setTitle(I18N.message("downloadindexedtext"));
136135
downloadIndexed.addClickHandler(evnt -> {
137-
Record rec = list.getSelectedRecord();
138-
FolderService.Instance.get().getFolder(rec.getAttributeAsLong("folderId"), false, false, false,
139-
new AsyncCallback<GUIFolder>() {
136+
FolderService.Instance.get().getFolder(selectedRecord.getAttributeAsLong("folderId"), false, false,
137+
false, new AsyncCallback<GUIFolder>() {
140138

141139
@Override
142140
public void onFailure(Throwable caught) {
@@ -146,12 +144,13 @@ public void onFailure(Throwable caught) {
146144
@Override
147145
public void onSuccess(GUIFolder folder) {
148146
if (folder.isDownload())
149-
Util.download(
150-
Util.downloadURL(rec.getAttributeAsLong(DOC_ID)) + "&downloadText=true");
147+
Util.download(Util.downloadURL(selectedRecord.getAttributeAsLong(DOC_ID))
148+
+ "&downloadText=true");
151149
}
152150
});
153151

154152
});
153+
downloadIndexed.setEnabled(selectedRecord.getAttributeAsString("event").contains("ocr.success"));
155154

156155
contextMenu.setItems(preview, downloadIndexed, openInFolder);
157156
contextMenu.showContextMenu();

logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/system/ProgressCanvas.java

Lines changed: 0 additions & 40 deletions
This file was deleted.

0 commit comments

Comments
 (0)