matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Add debugging output in storage parser code

Browse source
This commit is contained in:
Matthias Beyer 2015-11-27 22:18:26 +01:00
parent 53a14ea1dc
commit 9edad2800f
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/storage/parser.rs
View file

@ -99,28 +99,36 @@ impl<'a, HP> Parser<HP> where
pub fn read(&self, s: String) -> Result<(FileHeaderData, String), ParserError> pub fn read(&self, s: String) -> Result<(FileHeaderData, String), ParserError>
{ {
debug!("Reading into internal datastructure: '{}'", s);
let divided = self.divide_text(&s); let divided = self.divide_text(&s);
if divided.is_err() { if divided.is_err() {
debug!("Error reading into internal datastructure");
return Err(divided.err().unwrap()); return Err(divided.err().unwrap());
} }
let (header, data) = divided.ok().unwrap(); let (header, data) = divided.ok().unwrap();
debug!("Header = '{:?}'", header);
debug!("Data = '{:?}'", data);
let h_parseres = try!(self.headerp.read(header)); let h_parseres = try!(self.headerp.read(header));
debug!("Success parsing header");
Ok((h_parseres, data.unwrap_or(String::new()))) Ok((h_parseres, data.unwrap_or(String::new())))
} }
pub fn write(&self, tpl : (FileHeaderData, String)) -> Result<String, ParserError> pub fn write(&self, tpl : (FileHeaderData, String)) -> Result<String, ParserError>
{ {
debug!("Parsing internal datastructure to String");
let (header, data) = tpl; let (header, data) = tpl;
let h_text = try!(self.headerp.write(&header)); let h_text = try!(self.headerp.write(&header));
debug!("Success translating header");
Ok(h_text + &data[..]) Ok(h_text + &data[..])
} }
fn divide_text(&self, text: &String) -> Result<TextTpl, ParserError> { fn divide_text(&self, text: &String) -> Result<TextTpl, ParserError> {
debug!("Splitting: '{}'", text);
let re = Regex::new(r"(?m)^\-\-\-$\n(.*)^\-\-\-$\n(.*)").unwrap(); let re = Regex::new(r"(?m)^\-\-\-$\n(.*)^\-\-\-$\n(.*)").unwrap();
let captures = re.captures(&text[..]).unwrap_or( let captures = re.captures(&text[..]).unwrap_or(
@ -137,6 +145,9 @@ impl<'a, HP> Parser<HP> where
let header = captures.at(0).map(|s| String::from(s)); let header = captures.at(0).map(|s| String::from(s));
let content = captures.at(1).map(|s| String::from(s)); let content = captures.at(1).map(|s| String::from(s));
debug!("Splitted, Header = '{:?}'", header);
debug!("Splitted, Data = '{:?}'", content);
Ok((header, content)) Ok((header, content))
} }