diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/ClientRecommender.tsx | 9 | ||||
| -rw-r--r-- | src/client/views/nodes/DocumentView.tsx | 16 |
2 files changed, 19 insertions, 6 deletions
diff --git a/src/client/ClientRecommender.tsx b/src/client/ClientRecommender.tsx index 0e1e8175a..73b05cf1a 100644 --- a/src/client/ClientRecommender.tsx +++ b/src/client/ClientRecommender.tsx @@ -145,14 +145,17 @@ export class ClientRecommender extends React.Component<RecommenderProps> { * Uses Cognitive Services to extract keywords from a document */ - public async extractText(dataDoc: Doc, extDoc: Doc, internal: boolean = true, isMainDoc: boolean = false) { + public async extractText(dataDoc: Doc, extDoc: Doc, internal: boolean = true, isMainDoc: boolean = false, image: boolean = false) { let fielddata = Cast(dataDoc.data, RichTextField); + if (image && extDoc.generatedTags) { + console.log(StrCast(extDoc.generatedTags)); + } let data: string; fielddata ? data = fielddata[ToPlainText]() : data = ""; let converter = async (results: any, data: string) => { let keyterms = new List<string>(); // raw keywords // let keyterms_counted = new List<string>(); // keywords, where each keyword is repeated. input to w2v - let kp_string: string = ""; // keywords concatenated into a string. input into TF + let kp_string: string = ""; // keywords*frequency concatenated into a string. input into TF let highKP: string[] = [""]; // most frequent keyphrase let high = 0; results.documents.forEach((doc: any) => { @@ -190,7 +193,7 @@ export class ClientRecommender extends React.Component<RecommenderProps> { if (!internal) values = await this.sendRequest(highKP); return { keyterms: keyterms, external_recommendations: values, kp_string: [kp_string] }; }; - if (data != "") { + if (data !== "") { return CognitiveServices.Text.Appliers.analyzer(dataDoc, extDoc, ["key words"], data, converter, isMainDoc, internal); } return; diff --git a/src/client/views/nodes/DocumentView.tsx b/src/client/views/nodes/DocumentView.tsx index ab2717eed..960ec744e 100644 --- a/src/client/views/nodes/DocumentView.tsx +++ b/src/client/views/nodes/DocumentView.tsx @@ -589,16 +589,26 @@ export class DocumentView extends DocComponent<DocumentViewProps, Document>(Docu ClientRecommender.Instance.reset_docs(); //ClientRecommender.Instance.arxivrequest("electrons"); await Promise.all(allDocs.map((doc: Doc) => { - let mainDoc: boolean = false; + let isMainDoc: boolean = false; const dataDoc = Doc.GetDataDoc(doc); if (doc.type === DocumentType.TEXT) { if (dataDoc === Doc.GetDataDoc(this.props.Document)) { - mainDoc = true; + isMainDoc = true; } if (!documents.includes(dataDoc)) { documents.push(dataDoc); const extdoc = doc.data_ext as Doc; - return ClientRecommender.Instance.extractText(doc, extdoc ? extdoc : doc, true, mainDoc); + return ClientRecommender.Instance.extractText(doc, extdoc ? extdoc : doc, true, isMainDoc); + } + } + if (doc.type === DocumentType.IMG) { + if (dataDoc === Doc.GetDataDoc(this.props.Document)) { + isMainDoc = true; + } + if (!documents.includes(dataDoc)) { + documents.push(dataDoc); + const extdoc = doc.data_ext as Doc; + return ClientRecommender.Instance.extractText(doc, extdoc ? extdoc : doc, true, isMainDoc, true); } } })); |