@@ -79,8 +79,13 @@ function os2web_edoc_esdh_mm_import_meeting($meeting) {
7979 }
8080 $ meetings = array ();
8181 if (is_file (drupal_realpath ($ file ))) {
82+ <<<<<<< HEAD
8283
8384 libxml_use_internal_errors (true );
85+ =======
86+
87+ //libxml_use_internal_errors(true);
88+ >>>>>>> balk_merge
8489 $ manifest = simplexml_load_string (utf8_for_xml (file_get_contents (drupal_realpath ($ file ))), 'SimpleXMLElement ' , LIBXML_NOWARNING );
8590
8691 libxml_clear_errors ();
@@ -135,16 +140,16 @@ function os2web_edoc_esdh_mm_import_meeting($meeting) {
135140
136141 // Saving the meeting data in ESDH Provider format.
137142 $ meeting = array (
138- 'system_id ' => $ meeeeting_id ,
143+ 'system_id ' => $ meeting_id ,
139144 'meeting_id ' => $ meeting_id ,
140145 'meeting_sub_id ' => $ meeting_id ,
141146 'committee ' => $ committee ,
142147 'title ' => $ committee . " - " . $ meeting_date . " - " . $ meeting_type . " - " . $ ref_state . " - " . $ meeting_id ,
143148 'uri ' => strstr ($ file , 'eDocAgendaPublishing.xml ' , TRUE ),
144- 'meeting_date ' => $ meeting_date ,
145- 'meeting_type ' => $ meeting_type ,
149+ 'meeting_date_start ' => $ meeting_date ,
150+ 'type ' => $ meeting_type ,
146151 'meeting_state ' => $ meeting_state ,
147- 'meeting_pdf ' => $ meeting_pdf ,
152+ 'full_doc ' => $ meeting_pdf ,
148153 );
149154
150155 // Error logging to watchdog if the agenda item list is empty
0 commit comments