@@ -165,14 +165,10 @@ function _os2web_edoc_esdh_mm_import_meeting_agenda(&$meeting, $agenda_xml) {
165
165
'title ' => $ meeting ['committee ' ],
166
166
);
167
167
// Import all agenda items.
168
- #error_log(print_r($agenda_xml, 1));
169
168
$ agenda_bullet = $ agenda_xml ;
170
- #error_log(print_r($agenda_xml, 1));
171
169
foreach ($ agenda_bullet ->MeetingAgendaItem as $ agenda_item ) {
172
- #error_log(print_r($agenda_item, 1));
173
170
if (($ item = _os2web_edoc_esdh_mm_import_meeting_agenda_item ($ meeting , $ agenda_item )) !== FALSE ) {
174
171
$ agenda ['items ' ][] = $ item ;
175
- ## error_log(print_r($agenda_item, 1));
176
172
}
177
173
}
178
174
// Apply defaults, just in case we missed something.
@@ -199,10 +195,10 @@ function _os2web_edoc_esdh_mm_import_meeting_agenda_item($meeting, $xml) {
199
195
$ xml_item ['number ' ] = (int ) $ xml ->AgendaItemNumber ;
200
196
$ xml_item ['pdf ' ] = (string ) $ xml ->PDFDocument ;
201
197
$ xml_item_document = $ xml ->Document ;
198
+ $ xml_item_bullet = $ xml_item_document ->Attachments ;
202
199
$ xml_item ['name ' ] = (string ) $ xml_item_document ->NeutralTitle ;
203
200
$ xml_item ['document_type ' ] = (string ) $ xml_item_document ->PublishingType ;
204
201
205
- #error_log(print_r($meeting, 1));
206
202
$ item = array (
207
203
'id ' => $ xml_item ['number ' ],
208
204
'title ' => 'Punkt ' . $ xml_item ['number ' ] . ' ' . $ xml_item ['name ' ],
@@ -216,42 +212,54 @@ function _os2web_edoc_esdh_mm_import_meeting_agenda_item($meeting, $xml) {
216
212
'title ' => $ xml_item ['name ' ],
217
213
),
218
214
);
219
- error_log (print_r ($ item , 1 ));
220
215
221
216
// Deny closed content.
222
217
if ($ item ['access ' ] === 'SKAL PUBLICERES ' ) {
223
- // Process attachments.
224
- // foreach ($xml->xpath("table[@name='bullet']") as $bullet_xml) {
225
- // if (($bullet = _os2web_edoc_esdh_import_bullet($info, $bullet_xml)) !== FALSE) {
226
- // if (is_int($bullet['sort']) && $bullet['sort'] > 0) {
227
- // $item['bullets'][$bullet['sort'] - 1] = $bullet;
228
- // }
229
- // else {
230
- // $item['bullets'][] = $bullet;
231
- // }
232
- // }
233
- // }
234
- // Process attachments.
235
- #error_log(print_r($xml_item_document->Attachments, 1 ));
236
- foreach ($ xml_item_document ->Attachments as $ enclosures ) {
237
- #error_log(print_r($enclosure, 1 ));
238
- foreach ($ enclosures ->Attachment as $ enclosure ) {
239
- #error_log(print_r($enclosure, 1 ));
240
- $ enclosure_item ['filename_in ' ] = (string ) $ enclosure ->PDFDocument ;
241
- $ enclosure_item ['access ' ] = (string ) $ enclosure ->PublishingType ;
242
- if (strlen ($ enclosure_item ['filename_in ' ]) > 0 && $ enclosure_item ['access ' ] === 'SKAL PUBLICERES ' ) {
243
- $ item ['enclosures ' ][] = array (
244
- 'uri ' => implode ('/ ' , array (
245
- trim ($ meeting ['uri ' ], "/ " ),
246
- $ enclosure_item ['filename_in ' ])),
247
- 'title ' => trim ((string ) $ enclosure ->NeutralTitle ),
248
- 'access ' => TRUE ,
218
+ // Process bullets.
219
+ foreach ($ xml_item_bullet ->Attachment as $ bullet_xml ) {
220
+ error_log ("*********************** " );
221
+ $ bullet_title = (string ) $ bullet_xml ->NeutralTitle ;
222
+ $ bullet_body = (string ) $ bullet_xml ->FullText ;
223
+ $ bullet_access = $ bullet_xml ->PublishingType ;
224
+ error_log ("access " . $ bullet_access . "Titel: " . $ bullet_title );
225
+ if (empty ($ bullet_body )) {
226
+ $ bullet_body = "Intet indhold " ;
227
+ }
228
+ else {
229
+ if ($ bullet_access == 'SKAL PUBLICERES ' ) {
230
+ }
231
+ else {
232
+ $ bullet_body = "Dette er et lukket punkt. Du kan læse selve indstillingen " . $ bullet_xml ['access ' ];
233
+ }
234
+ }
235
+ if (!empty ($ bullet_title )) {
236
+ $ item ['bullets ' ][] = array (
237
+ 'title ' => (string ) $ bullet_title ,
238
+ 'body ' => (string ) $ bullet_body ,
249
239
);
250
240
}
251
- }
252
- }
241
+
242
+ # error_log(print_r($item, 1));
243
+ // Process enclsures.
244
+ # foreach ($xml_item_document->Attachment as $enclosures) {
245
+ foreach ($ xml_item_bullet ->Attachment as $ enclosure ) {
246
+ $ enclosure_item ['filename_in ' ] = (string ) $ enclosure ->PDFDocument ;
247
+ $ enclosure_item ['access ' ] = (string ) $ enclosure ->PublishingType ;
248
+ #error_log(print_r($enclosure,1));
249
+ if (strlen ($ enclosure_item ['filename_in ' ]) > 0 && $ enclosure_item ['access ' ] == 'SKAL PUBLICERES ' ) {
250
+ $ item ['enclosures ' ][] = array (
251
+ 'uri ' => implode ('/ ' , array (
252
+ trim ($ meeting ['uri ' ], "/ " ),
253
+ $ enclosure_item ['filename_in ' ])),
254
+ 'title ' => trim ((string ) $ enclosure ->Title ),
255
+ 'access ' => TRUE ,
256
+ );
257
+ }
258
+ }
259
+ #error_log(print_r($item['enclosures'],1));
260
+ # }
261
+ }
253
262
}
254
- #error_log(print_r($item, 1));
255
263
$ item += os2web_esdh_provider_default_item ();
256
264
return $ item ;
257
265
}
@@ -303,7 +311,7 @@ function _os2web_edoc_esdh_mm_order_addenums($drush = FALSE) {
303
311
return ;
304
312
}
305
313
$ nodes = $ nodes_result ['node ' ];
306
- error_log (print_r ($ nodes , 1 ));
314
+ # error_log(print_r($nodes, 1));
307
315
// Load necessary fields into the node object.
308
316
$ fields = field_info_instances ('node ' , 'meeting ' );
309
317
field_attach_load ('node ' , $ nodes , FIELD_LOAD_CURRENT , array ('field_id ' => $ fields ['field_os2web_meetings_addendum ' ]['field_id ' ]));
0 commit comments