Update app.py
Browse files
app.py
CHANGED
|
@@ -610,12 +610,14 @@ def measureproject(result,dataDoc=0,img=0,dxffile=0,pdf_content=0):
|
|
| 610 |
# pdf_contentSched = fitz.open(stream=pdf_contentSched, filetype="pdf")
|
| 611 |
annotatedimgs, pdf_document , list1, repeated_labels , not_found, bax_pretty_xml, column_xml =Doors_Schedule.mainRun(pdf_contentSched, dataDoc, SearchArray,pdf_content,pdf_contentSched)
|
| 612 |
else:
|
| 613 |
-
|
| 614 |
-
|
| 615 |
-
|
| 616 |
-
|
|
|
|
|
|
|
| 617 |
annotatedimgs, pdf_document , list1, repeated_labels , not_found, bax_pretty_xml, column_xml =Doors_Schedule.mainRun(dataDocDoorsSchedule, dataDoc, SearchArray)
|
| 618 |
-
|
| 619 |
dbPath='/TSA JOBS/ADR Test'+pdfpath+'Measured Plan/'
|
| 620 |
pdflink= tsadropboxretrieval.uploadanyFile(doc=pdf_document,path=dbPath,pdfname="combined_output.pdf") #doc=doc,pdfname=path,pdfpath=pdfpath+'Measured Plan/
|
| 621 |
|
|
|
|
| 610 |
# pdf_contentSched = fitz.open(stream=pdf_contentSched, filetype="pdf")
|
| 611 |
annotatedimgs, pdf_document , list1, repeated_labels , not_found, bax_pretty_xml, column_xml =Doors_Schedule.mainRun(pdf_contentSched, dataDoc, SearchArray,pdf_content,pdf_contentSched)
|
| 612 |
else:
|
| 613 |
+
dataDocDoorsSchedule = []
|
| 614 |
+
for r in result[6]:
|
| 615 |
+
pdfpathDoors,_=tsadropboxretrieval.getPathtoPDF_File(nameofPDF= r)
|
| 616 |
+
dbxTeam= tsadropboxretrieval.ADR_Access_DropboxTeam('user')
|
| 617 |
+
md, resDoors =dbxTeam.files_download(path=pdfpathDoors)
|
| 618 |
+
dataDocDoorsSchedule.append(resDoors.content)
|
| 619 |
annotatedimgs, pdf_document , list1, repeated_labels , not_found, bax_pretty_xml, column_xml =Doors_Schedule.mainRun(dataDocDoorsSchedule, dataDoc, SearchArray)
|
| 620 |
+
|
| 621 |
dbPath='/TSA JOBS/ADR Test'+pdfpath+'Measured Plan/'
|
| 622 |
pdflink= tsadropboxretrieval.uploadanyFile(doc=pdf_document,path=dbPath,pdfname="combined_output.pdf") #doc=doc,pdfname=path,pdfpath=pdfpath+'Measured Plan/
|
| 623 |
|