/[public]/psiconv/trunk/lib/psiconv/parse_page.c
ViewVC logotype

Diff of /psiconv/trunk/lib/psiconv/parse_page.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 76 Revision 142
… …
23#include <stdlib.h> 23#include <stdlib.h>
24#include <string.h> 24#include <string.h>
25 25
26#include "parse_routines.h" 26#include "parse_routines.h"
27#include "error.h" 27#include "error.h"
28
29#ifdef DMALLOC
30#include <dmalloc.h>
31#endif
32
28 33
29int psiconv_parse_page_header(const psiconv_buffer buf,int lev,psiconv_u32 off, 34int psiconv_parse_page_header(const psiconv_buffer buf,int lev,psiconv_u32 off,
30 int *length,psiconv_page_header *result) 35 int *length,psiconv_page_header *result)
31{ 36{
32 int res = 0; 37 int res = 0;
33 int len = 0; 38 int len = 0;
34 int i,leng; 39 int i,leng,has_content;
35 psiconv_u32 temp; 40 psiconv_u32 temp;
36 41
37 psiconv_progress(lev+1,off,"Going to read a page header (or footer)"); 42 psiconv_progress(lev+1,off,"Going to read a page header (or footer)");
38 if (!(*result = malloc(sizeof(**result)))) 43 if (!(*result = malloc(sizeof(**result))))
39 goto ERROR1; 44 goto ERROR1;
40 45
41 psiconv_progress(lev+2,off+len, 46 psiconv_progress(lev+2,off+len,
42 "Going to read the first byte (0x01 expected)"); 47 "Going to read the has_content flag");
43 temp = psiconv_read_u8(buf,lev+2,off+len,&res); 48 temp = psiconv_read_u8(buf,lev+2,off+len,&res);
44 if (res) 49 if (res)
45 goto ERROR2; 50 goto ERROR2;
46 if (temp != 0x01) { 51 if (temp == 0x00)
47 psiconv_warn(lev+2,off+len,"Page header first byte mismatch"); 52 has_content = 0;
48 psiconv_debug(lev+2,off+len,"First byte: read %02x, expected %02x", 53 else if (temp == 0x01)
49 temp,0x01); 54 has_content = 1;
55 else {
56 psiconv_warn(lev+2,off+len,
57 "Page header has_content flag unknown value (assumed default)");
58 psiconv_debug(lev+2,off+len,"Flag: %02x",temp);
59 has_content = 1;
50 } 60 }
61 psiconv_debug(lev+2,off+len,"Has_content flag: %02x",has_content);
51 len += 1; 62 len += 1;
52 63
53 psiconv_progress(lev+2,off+len,"Going to read displayed-on-first-page flag"); 64 psiconv_progress(lev+2,off+len,"Going to read displayed-on-first-page flag");
54 if ((res = psiconv_parse_bool(buf,lev+2,off+len,&leng, 65 if ((res = psiconv_parse_bool(buf,lev+2,off+len,&leng,
55 &(*result)->on_first_page))) 66 &(*result)->on_first_page)))
… …
70 } 81 }
71 82
72 psiconv_progress(lev+2,off+len,"Going to read base paragraph layout"); 83 psiconv_progress(lev+2,off+len,"Going to read base paragraph layout");
73 if (!((*result)->base_paragraph_layout = psiconv_basic_paragraph_layout())) 84 if (!((*result)->base_paragraph_layout = psiconv_basic_paragraph_layout()))
74 goto ERROR2; 85 goto ERROR2;
86
87 if (has_content) {
75 if ((res = psiconv_parse_paragraph_layout_list(buf,lev+2,off+len,&leng, 88 if ((res = psiconv_parse_paragraph_layout_list(buf,lev+2,off+len,&leng,
76 (*result)->base_paragraph_layout))) 89 (*result)->base_paragraph_layout)))
77 goto ERROR3; 90 goto ERROR3;
78 len += leng; 91 len += leng;
92 }
79 93
80 psiconv_progress(lev+2,off+len,"Going to read base character layout"); 94 psiconv_progress(lev+2,off+len,"Going to read base character layout");
81 if (!((*result)->base_character_layout = psiconv_basic_character_layout())) 95 if (!((*result)->base_character_layout = psiconv_basic_character_layout()))
82 goto ERROR3; 96 goto ERROR3;
97 if (has_content) {
83 if ((res = psiconv_parse_character_layout_list(buf,lev+2,off+len,&leng, 98 if ((res = psiconv_parse_character_layout_list(buf,lev+2,off+len,&leng,
84 (*result)->base_character_layout))) 99 (*result)->base_character_layout)))
85 goto ERROR4; 100 goto ERROR4;
101 }
86 len += leng; 102 len += leng;
87 103
88 104
89 psiconv_progress(lev+2,off+len,"Going to read the TextEd section"); 105 psiconv_progress(lev+2,off+len,"Going to read the TextEd section");
106 if (has_content) {
90 if ((res = psiconv_parse_texted_section(buf,lev+2,off+len,&leng, 107 if ((res = psiconv_parse_texted_section(buf,lev+2,off+len,&leng,
91 &(*result)->text, 108 &(*result)->text,
92 (*result)->base_character_layout, 109 (*result)->base_character_layout,
93 (*result)->base_paragraph_layout))) 110 (*result)->base_paragraph_layout)))
94 goto ERROR4; 111 goto ERROR4;
95 len += leng; 112 len += leng;
113 } else {
114 (*result)->text = NULL;
115 }
96 116
97 if (length) 117 if (length)
98 *length = len; 118 *length = len;
99 119
100 psiconv_progress(lev+1,off+len-1,"End of page header" 120 psiconv_progress(lev+1,off+len-1,"End of page header"
Legend:
Removed from v.76  
changed lines
  Added in v.142
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26