[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenonbeta/krecipes/src
From:       Jason Kivlighn <confederacy2 () excite ! com>
Date:       2004-05-08 0:37:34
Message-ID: 20040508003734.0C49C1719 () office ! kde ! org
[Download RAW message or body]

CVS commit by jkivlighn: 

-Update the CookML exporter to include the preparation method
-When the Meal-Master importer finds an ingredient header, it shortens the number of \
hythens before and after the header name before importing it 


  M +1 -0      exporters/cookmlexporter.cpp   1.11
  M +6 -2      importers/mmfimporter.cpp   1.20


--- kdenonbeta/krecipes/src/exporters/cookmlexporter.cpp  #1.10:1.11
@@ -97,4 +97,5 @@ QString CookMLExporter::createContent( c
                                 ingredient_tag.setAttribute("unit",(*ing_it).units);
                                 ingredient_tag.setAttribute("item",(*ing_it).name);
+                                \
ingredient_tag.setAttribute("preparation",(*ing_it).prepMethod);  \
part_tag.appendChild( ingredient_tag );  }

--- kdenonbeta/krecipes/src/importers/mmfimporter.cpp  #1.19:1.20
@@ -257,5 +257,9 @@ bool MMFImporter::loadIngredientHeader( 
         {
                 QString header(string.stripWhiteSpace());
-                header = header.mid( 10, header.length() - 20 );
+
+                //get only the header name
+                header.remove(QRegExp("^MMMMM"));
+                header.remove(QRegExp("^-*")).remove(QRegExp("-*$"));
+                
                 kdDebug()<<"found ingredient header: "<<header<<endl;
 
@@ -270,5 +274,5 @@ bool MMFImporter::loadIngredientHeader( 
 
                 Ingredient title;
-                title.name = header;
+                title.name = "----" + header + "----";
                 title.units = ""; title.amount = 0;
                 m_all_ing.append( title );


[prev in list] [next in list] [prev in thread] [next in thread]