Changeset 1758

Show
Ignore:
Timestamp:
2006-01-08 17:22:30 (3 years ago)
Author:
ctford
Message:

Bug with removing src attribute of import elements fixed.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • phpannodex/trunk/phpsrc/CGI/nph-mod_annodex.php

    r1756 r1758  
    9898        $cmml_filename = $filename_root . ".cmml"; 
    9999         
    100         /* Spit it straight out. */ 
     100        /* Spit it straight out, removing the src attribute from imports. */ 
    101101        $xml = simplexml_load_file( $cmml_filename ); 
    102  
    103         //var_dump( $xml ); 
    104         unset ($xml->stream);  
    105  
     102        foreach( $xml->stream->import as $import ) { 
     103                unset( $import['src'] ); 
     104        } 
    106105        echo $xml->asXML(); 
    107106 
    …… 
    113112 
    114113        $filename = $filename_root . ".ogg"; 
     114        $cmml_filename = $filename_root . ".cmml"; 
    115115 
    116116        try { 
    …… 
    133133        $clip = $query_array['clip']; 
    134134 
    135         $anx->import( $filename, $id, $content_type, $interval->get_start(),  
    136                 $interval->get_end()); 
     135        $anx->import( $cmml_filename, $id, $content_type,  
     136                $interval->get_start(), $interval->get_end()); 
    137137 
    138138        /* Output bitrate and duration information to the headers. */