Project

General

Profile

« Previous | Next » 

Revision 17993bbd

Added by Andreas Kohlbecker almost 6 years ago

ref #6659 showing mediaCreated by default

View differences:

modules/cdm_dataportal/includes/media.inc
127 127
 * @return array
128 128
 *   The array with the available specified metadata info.
129 129
 */
130
function read_media_metadata($media) {
130
function read_media_metadata($media)
131
{
131 132

  
132 133
  $metadata = array(
133 134
    'title' => '',// Media_metadata and media.
......
141 142

  
142 143
  // Getting the media metadata.
143 144
  $media_metadata = cdm_ws_get(CDM_WS_MEDIA_METADATA, array($media->uuid));
144
  $media_metadata_aux = (array) $media_metadata;
145
  $media_metadata_aux = (array)$media_metadata;
145 146

  
146 147

  
147 148
  // Filename.
......
149 150
    $fileUri = $media->representations[0]->parts[0]->uri;
150 151
    $filename = substr($fileUri, strrpos($fileUri, "/") + 1);
151 152
    $metadata['filename'] = $filename;
152
  }
153
  else {
153
  } else {
154 154
    $metadata['filename'] = '';
155 155
  }
156 156

  
......
161 161
    $metadata['title'] = $media->titleCache;
162 162
  } else if (!empty($media_metadata->ObjectName)) {
163 163
    $metadata['title'] = $media_metadata->ObjectName;
164
  } else  if (!empty($media_metadata_aux['Object Name'])) {
164
  } else if (!empty($media_metadata_aux['Object Name'])) {
165 165
    $metadata['title'] = $media_metadata_aux['Object Name'];
166 166
  } else if (!empty($media->titleCache)) {
167 167
    $metadata['title'] = $media->titleCache;
168 168
  }
169 169

  
170
  if(!empty($media->description_L10n)){
170
  if (!empty($media->description_L10n)) {
171 171
    $metadata['description'] = $media->description_L10n;
172 172
  }
173 173

  
174 174
  // Artist.
175 175
  if (!empty($media->artist->titleCache)) {
176 176
    $metadata['artist'] = $media->artist->titleCache;
177
  }
178
  else if (!empty($media_metadata->Artist)) {
177
  } else if (!empty($media_metadata->Artist)) {
179 178
    $metadata['artist'] = '' . $media_metadata->Artist;
180 179
  }
181 180

  
182 181
  // Rights
183 182
  $metadata['rights'] = array();
184 183
  if (!empty($media_metadata->Copyright)) {
185
    $rightsObj =  new stdClass();
184
    $rightsObj = new stdClass();
186 185
    $rightsObj->type = new stdClass();
187 186
    $rightsObj->type->uuid = UUID_RIGHTS_COPYRIGHT;
188 187
    $rightsObj->type->titleCache = 'copyright';
......
190 189
    $rightsObj->type->text = $media_metadata->Copyright;
191 190
    $metadata['rights'][] = $rightsObj;
192 191
  }
193
  if(isset($media->rights) && is_array($media->rights)) {
192
  if (isset($media->rights) && is_array($media->rights)) {
194 193
    $metadata['rights'] = array_merge($metadata['rights'], $media->rights);
195 194
  }
196 195

  
......
202 201
  $metadata['location']['sublocation'] = !empty($media_metadata->Sublocation) ? $media_metadata->Sublocation : FALSE;
203 202
  $metadata['location']['city'] = !empty($media_metadata->City) ? $media_metadata->City : FALSE;
204 203
  $metadata['location']['province'] = !empty($media_metadata->Province) ? $media_metadata->Province : FALSE;
205
  $metadata['location']['country'] = !empty($media_metadata->Country)? $media_metadata->Country : FALSE;
204
  $metadata['location']['country'] = !empty($media_metadata->Country) ? $media_metadata->Country : FALSE;
206 205

  
207 206
  /*
208 207
   // Creation date.
209 208
   if($media_metadata["Modify Date"])
210 209
   $metadata_caption['mediacreated'] = $media_metadata["Modify Date"];
211 210
   else
212
   $metadata_caption['mediacreated'] = $media->created;
213 211
   */
212
  if (!empty($media->mediaCreated)) {
213
    $metadata_caption['mediacreated'] =  timePeriodToString($media->mediaCreated);
214
  }
214 215

  
215 216
  return $metadata;
216 217
}
modules/cdm_dataportal/theme/cdm_dataportal.media.theme
259 259
  if ($media_metadata['artist'] && $doArtist) {
260 260
    _description_list_group_add($groups, t('Artist') . ':', $media_metadata['artist'] );
261 261
  }
262
  // MediaCreated
263
  if ($media_metadata['mediacreated'] && $doArtist) {
264
    _description_list_group_add($groups, t('Created') . ':', $media_metadata['mediacreated'] );
265
  }
262 266
  // Location.
263 267
  if ($doLocation) {
264 268
    $location = '';

Also available in: Unified diff