|
4 | 4 | import com.aliensoft.quickview.domain.web.MediaType;
|
5 | 5 | import com.aliensoft.quickview.domain.wrapper.ErrorMsgWrapper;
|
6 | 6 | import com.aliensoft.quickview.domain.wrapper.FileDescriptionWrapper;
|
| 7 | +import com.aliensoft.quickview.domain.wrapper.LoadedPageWrapper; |
7 | 8 | import com.aliensoft.quickview.domain.wrapper.RotatedPageWrapper;
|
8 | 9 | import com.aliensoft.quickview.domain.wrapper.UploadedDocumentWrapper;
|
9 | 10 | import com.aliensoft.quickview.views.QuickView;
|
@@ -187,19 +188,25 @@ public Object loadDocumentDescription(@Context HttpServletRequest request, @Cont
|
187 | 188 | public Object loadDocumentPage(@Context HttpServletRequest request, @Context HttpServletResponse response){
|
188 | 189 | try {
|
189 | 190 | // set response content type
|
190 |
| - setResponseContentType(response, MediaType.TEXT_HTML); |
| 191 | + setResponseContentType(response, MediaType.APPLICATION_JSON); |
191 | 192 | // get request body
|
192 | 193 | String requestBody = getRequestBody(request);
|
193 | 194 | // get/set parameters
|
194 | 195 | String documentGuid = getJsonString(requestBody, "guid");
|
195 | 196 | int pageNumber = getJsonInteger(requestBody, "page");
|
| 197 | + LoadedPageWrapper loadedPage = new LoadedPageWrapper(); |
196 | 198 | // set options
|
197 | 199 | HtmlOptions htmlOptions = new HtmlOptions();
|
198 | 200 | htmlOptions.setPageNumber(pageNumber);
|
199 | 201 | htmlOptions.setCountPagesToRender(1);
|
200 | 202 | htmlOptions.setResourcesEmbedded(true);
|
| 203 | + // get page HTML |
| 204 | + loadedPage.setPageHtml(viewerHtmlHandler.getPages(documentGuid, htmlOptions).get(0).getHtmlContent()); |
| 205 | + // get page rotation angle |
| 206 | + String angle = String.valueOf(viewerHtmlHandler.getDocumentInfo(documentGuid).getPages().get(pageNumber - 1).getAngle()); |
| 207 | + loadedPage.setAngle(angle); |
201 | 208 | // return html
|
202 |
| - return viewerHtmlHandler.getPages(documentGuid, htmlOptions).get(0).getHtmlContent(); |
| 209 | + return objectToJson(loadedPage); |
203 | 210 | }catch (Exception ex){
|
204 | 211 | // set response content type
|
205 | 212 | setResponseContentType(response, MediaType.APPLICATION_JSON);
|
|
0 commit comments